r10333 - in /desktop/unstable/nautilus/debian: ./ patches/

Tue Apr 24 20:38:00 UTC 2007

Author: slomo
Date: Tue Apr 24 20:38:00 2007
New Revision: 10333

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10333
Log:
* move experimental branch to unstable

Added:
    desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
    desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
    desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
    desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
    desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
    desktop/unstable/nautilus/debian/patches/08_folder_handler.patch
    desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch
    desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
    desktop/unstable/nautilus/debian/patches/series
Removed:
    desktop/unstable/nautilus/debian/patches/10_nautilus-directory-cache-is-local.patch
    desktop/unstable/nautilus/debian/patches/30_row-deleted-before-deleting.patch
    desktop/unstable/nautilus/debian/patches/31_double-free-in-audio-preview.patch
    desktop/unstable/nautilus/debian/patches/32_remove-directory-assert-in-view.patch
    desktop/unstable/nautilus/debian/patches/50_ca_l10n.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control
    desktop/unstable/nautilus/debian/control.in
    desktop/unstable/nautilus/debian/nautilus.install
    desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch
    desktop/unstable/nautilus/debian/rules
    desktop/unstable/nautilus/debian/watch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=10333&op=diff
==============================================================================

--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Tue Apr 24 20:38:00 2007
@@ -1,51 +1,133 @@
-nautilus (2.14.3-11) unstable; urgency=medium
-
-  * New patch, 33_directory-null-vfs-uri, prevents crash when vfs_uri is NULL;
-    GNOME #320020.
-
- -- Loic Minier <lool at dooz.org>  Mon, 26 Feb 2007 11:12:06 +0100
-
-nautilus (2.14.3-10) unstable; urgency=medium
-
-  * New patch, 30_row-deleted-before-deleting, sends the row-deleted signal
-    before deleting rows, as recommended; backported from GNOME #356672 /
-    nautilus/2.16.2.
-  * New patch, 31_double-free-in-audio-preview, fixes double free; backported
-    from GNOME #321175 / nautilus/2.16.2.
-  * New patch, 32_remove-directory-assert-in-view, removes assert which might
-    cause crashes; backported from GNOME #352592 / nautilus/2.16.2.
-
- -- Loic Minier <lool at dooz.org>  Sun, 25 Feb 2007 11:58:27 +0100
-
-nautilus (2.14.3-9) unstable; urgency=medium
-
-   * 07_desktop_file_activation.patch:
-     + Compare numeric uids instead of using strcmp.
-     + Fix the context menu of "link" desktop items.
-
- -- Josselin Mouette <joss at debian.org>  Sun, 18 Feb 2007 17:44:12 +0100
-
-nautilus (2.14.3-8) unstable; urgency=medium
+nautilus (2.16.3-6) UNRELEASED; urgency=low
+
+  [ Josselin Mouette ]
+  * 10_location_titlebar.patch: patch from Adrien Delle Cave to display
+    the full location in the title bar when a setting is enabled
+    (closes: #413018).
+  * 01_prompt_same_file.patch: don't overwrite files when the source and
+    destination are strictly the same (closes: #419525).
+
+  [ Sebastian DrÃ¶ge ]
+  * Merge 2.14.3-11:
+    [ Loic Minier ]
+    + New patch, 33_directory-null-vfs-uri, prevents crash when vfs_uri is NULL;      GNOME #320020.
+
+ -- Sebastian DrÃ¶ge <slomo at debian.org>  Tue, 24 Apr 2007 22:36:01 +0200
+
+nautilus (2.16.3-5) experimental; urgency=low
+
+  * Bump up librsvg2-dev build-dep to >= 2.16.0-2 to make the package
+    autobuildable; add a librsvg2-common >= 2.16.0-2 build-dep since
+    desktop-base needs it, and librsvg2-dev doesn't pull it.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 13 Mar 2007 13:27:43 +0100
+
+nautilus (2.16.3-4) experimental; urgency=low
+
+  * 08_folder_handler.patch: add OnlyShowIn=GNOME to
+    nautilus-folder-handler.desktop (closes: #396969).
+  * 07_desktop_file_activation.patch:
+    + Compare numeric uids instead of using strcmp.
+    + Fix the context menu of "link" desktop items.
+  * 09_connect_server_iter.patch: patch from Christian Neumair to 
+    display only supported protocols in the "connect to" window
+    (closes: #375180).
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 25 Feb 2007 00:50:36 +0100
+
+nautilus (2.16.3-3) experimental; urgency=low
 
   [ Loic Minier ]
   * Add a get-orig-source target to retrieve the upstream tarball.
+  * Add an epoch to the libgnomevfs2-dev build-dep and dep.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
 
   [ Josselin Mouette ]
-  * 02_umask.patch: use the recommended method upstream, which should be
-    thread-safe and supports ACLs.
+  * 06_dont_create_Desktop.patch: patch from upstream bugzilla. Don't
+    create the Desktop directory when run with the --no-desktop option
+    (closes: #230757, #408896).
   * 07_desktop_file_activation.patch:
     + Don't launch desktop files that aren't at safe places
       (closes: #408556). This doesn't affect desktop files that are 
       merely links.
     + Don't launch those that don't end with .desktop (closes: #408948).
 
- -- Josselin Mouette <joss at debian.org>  Thu, 15 Feb 2007 19:15:30 +0100
-
-nautilus (2.14.3-7) unstable; urgency=medium
-
-  * 50_ca_l10n.patch: fix a quite visible typo in the Catalan translation.
-
- -- Jordi Mallach <jordi at debian.org>  Fri, 22 Dec 2006 11:20:26 +0100
+ -- Josselin Mouette <joss at debian.org>  Thu, 15 Feb 2007 17:23:51 +0100
+
+nautilus (2.16.3-2) experimental; urgency=low
+
+  * 03_sftp_connect.patch: patch from Mike Hommey to add a "connect to
+    server" context menu item for sftp shares (closes: #375181).
+  * 04_show_backup_files.patch: patch from Stephen Cook to display
+    backup files together with hidden files (closes: #401583).
+  * Refresh 11_umount-progress-bar.patch.
+  * 05_places-sidebar_single-click.patch: patch from UHU Linux to use 
+    single click in the "places" sidebar pane.
+
+ -- Josselin Mouette <joss at debian.org>  Wed,  3 Jan 2007 00:31:00 +0100
+
+nautilus (2.16.3-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Ship /usr/share/mime/application in nautilus.
+  * Merge 2.14.3-2, 2.14.3-3, and 2.14.3-4; credit
+    10_nautilus-directory-cache-is-local in 2.14.3-4 appropriately.
+  * Fix watch file to use HTTP.
+
+  [ Josselin Mouette ]
+  * Merge 2.14.3-6.
+  * Switch to quilt for patch handling.
+  * 02_umask.patch: use the recommended method upstream, which should be
+    thread-safe.
+  * 10_nautilus-directory-cache-is-local.patch: removed, integrated
+    upstream.
+  * 11_umount-progress-bar.patch: refresh translations.
+
+ -- Josselin Mouette <joss at debian.org>  Fri,  8 Dec 2006 22:29:03 +0100
+
+nautilus (2.16.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Brown paper bag update.
+  * 02_umask.patch: use and operator on not(umask), not the xor.
+
+  [ Loic Minier ]
+  * Bump the Depends on libgnomevfs2-dev >= 2.16.0-1 as well.
+  * Reorder build-deps to please pbuilder.
+  * Add missing build-deps on libgnomeui-dev (>= 2.6.0), libglib2.0-dev (>=
+    2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2).
+  * Version the liborbit2-dev build-dep to >= 2.4.0.
+  * Bump the libgnomeui-dev build-dep to >= 2.16.0-2 for gtk+2.0 2.10.
+  * Bump the libbonobo2-dev build-dep to >= 2.15 for gnome-vfs2 >= 2.16.0-1.
+  * Add ${shlibs:Depends} to libnautilus-extension-dev.
+  * New upstream release; no API change.
+
+ -- Loic Minier <lool at dooz.org>  Thu,  5 Oct 2006 17:04:18 +0200
+
+nautilus (2.16.0-2) experimental; urgency=low
+
+  [ Marco Cabizza ]
+  * Bump libgnomevfs2-dev build-dep to 2.16.0-1 for selinux support.
+
+  [ Loic Minier ]
+  * Upload.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 24 Sep 2006 21:45:45 +0200
+
+nautilus (2.16.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update watch file.
+  * Remove requirements on libpopt and libgsf.
+  * Update build-dependencies appropriately.
+  * Remove many unneeded dependencies for libnautilus-extension-dev.
+  * Build-depend on docbook-utils and libselinux1-dev.
+  * Build-depend on gnome-pkg-tools 0.7 and use clean-la.mk.
+  * Also use gnome-version.mk and use ${gnome:Version}.
+  * Bump shlibs to 2.15.90.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 12 Sep 2006 23:42:15 +0200
 
 nautilus (2.14.3-6) unstable; urgency=medium
 
@@ -68,7 +150,8 @@
 
   * New patch, 10_nautilus-directory-cache-is-local.patch, to cache the result
     of islocal() on NautilusDirectory objects; this is called relatively often
-    and should speed up browsing of network shares.
+    and should speed up browsing of network shares; from upstream CVS; credits
+    to Alexander Larsson and Federico Mena Quintero.
 
  -- Loic Minier <lool at dooz.org>  Wed, 15 Nov 2006 17:08:56 +0100
 

Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control (original)
+++ desktop/unstable/nautilus/debian/control Tue Apr 24 20:38:00 2007
@@ -2,13 +2,13 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, ClÃ©ment Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, OndÅ™ej SurÃ½ <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), libpopt-dev (>= 1.5), gettext, libgnomevfs2-dev (>= 2.13.92), libeel2-dev (>= 2.14.3), librsvg2-dev (>= 2.7), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libbonobo2-dev (>= 2.6),  libgconf2-dev (>= 2.6.1-2), desktop-base (>= 0.2), libgsf-1-dev, libxml-parser-perl, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libgtk2.0-dev (>= 2.6)
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, ClÃ©ment Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, OndÅ™ej SurÃ½ <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15),  libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2)
 Standards-Version: 3.7.2
 
 Package: nautilus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus-data (= ${source:Version}), shared-mime-info, gnome-control-center (>= 2.6), desktop-file-utils (>= 0.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus-data (>= ${gnome:Version}), nautilus-data (<< ${gnome:NextVersion}), shared-mime-info, gnome-control-center (>= 2.6), desktop-file-utils (>= 0.7)
 Recommends: desktop-base (>= 0.2), eject, nautilus-cd-burner (>= 2.6), librsvg2-common, libgnomevfs2-extra, fam
 Suggests: eog, evince | pdf-viewer, totem | mp3-decoder
 Conflicts: libnautilus2-2, libnautilus2-dev
@@ -58,7 +58,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}), libeel2-dev (>= 2.14.3), libbonoboui2-dev (>= 2.5.4), libgnome-desktop-dev, libgsf-1-dev, librsvg2-dev (>= 2.7)
+Depends: libnautilus-extension1 (= ${binary:Version}), libgtk2.0-dev (>= 2.10.0), libgnomevfs2-dev (>= 1:2.16.0-1), ${shlibs:Depends}
 Conflicts: libnautilus2-dev
 Replaces: libnautilus2-dev
 Description: libraries for nautilus components - development version

Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Tue Apr 24 20:38:00 2007
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), libpopt-dev (>= 1.5), gettext, libgnomevfs2-dev (>= 2.13.92), libeel2-dev (>= 2.14.3), librsvg2-dev (>= 2.7), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libbonobo2-dev (>= 2.6),  libgconf2-dev (>= 2.6.1-2), desktop-base (>= 0.2), libgsf-1-dev, libxml-parser-perl, gnome-pkg-tools, dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libgtk2.0-dev (>= 2.6)
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15),  libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2)
 Standards-Version: 3.7.2
 
 Package: nautilus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus-data (= ${source:Version}), shared-mime-info, gnome-control-center (>= 2.6), desktop-file-utils (>= 0.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, nautilus-data (>= ${gnome:Version}), nautilus-data (<< ${gnome:NextVersion}), shared-mime-info, gnome-control-center (>= 2.6), desktop-file-utils (>= 0.7)
 Recommends: desktop-base (>= 0.2), eject, nautilus-cd-burner (>= 2.6), librsvg2-common, libgnomevfs2-extra, fam
 Suggests: eog, evince | pdf-viewer, totem | mp3-decoder
 Conflicts: libnautilus2-2, libnautilus2-dev
@@ -58,7 +58,7 @@
 Package: libnautilus-extension-dev
 Architecture: any
 Section: libdevel
-Depends: libnautilus-extension1 (= ${binary:Version}), libeel2-dev (>= 2.14.3), libbonoboui2-dev (>= 2.5.4), libgnome-desktop-dev, libgsf-1-dev, librsvg2-dev (>= 2.7)
+Depends: libnautilus-extension1 (= ${binary:Version}), libgtk2.0-dev (>= 2.10.0), libgnomevfs2-dev (>= 1:2.16.0-1), ${shlibs:Depends}
 Conflicts: libnautilus2-dev
 Replaces: libnautilus2-dev
 Description: libraries for nautilus components - development version

Modified: desktop/unstable/nautilus/debian/nautilus.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus.install?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus.install (original)
+++ desktop/unstable/nautilus/debian/nautilus.install Tue Apr 24 20:38:00 2007
@@ -1,2 +1,3 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications
+debian/tmp/usr/share/mime/application

Added: desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch (added)
+++ desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,96 @@
+Index: nautilus-2.16.3/libnautilus-private/nautilus-file-operations.c
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/nautilus-file-operations.c	2007-04-19 21:48:30.868578500 +0200
++++ nautilus-2.16.3/libnautilus-private/nautilus-file-operations.c	2007-04-19 22:29:17.681494750 +0200
+@@ -1114,6 +1114,34 @@
+ 	return is_dir;
+ }
+ 
++static gboolean
++are_same_file (const char *first_uri, const char *second_uri)
++{
++	GnomeVFSFileInfo *info;
++	GnomeVFSResult result;
++	dev_t device;
++	GnomeVFSInodeNumber inode;
++	gboolean are_same = FALSE;
++
++	info = gnome_vfs_file_info_new ();
++	result = gnome_vfs_get_file_info (first_uri, info, GNOME_VFS_FILE_INFO_DEFAULT);
++	if (result == GNOME_VFS_OK &&
++	    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_DEVICE &&
++	    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_INODE) {
++		device = info->device;
++		inode = info->inode;
++		result = gnome_vfs_get_file_info (second_uri, info, GNOME_VFS_FILE_INFO_DEFAULT);
++		if (result == GNOME_VFS_OK &&
++		    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_DEVICE &&
++		    info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_INODE &&
++		    device == info->device && inode == info->inode) {
++			are_same = TRUE;
++		}
++	}
++	gnome_vfs_file_info_unref (info);
++
++	return are_same;
++}
+ 
+ static int
+ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
+@@ -1122,12 +1150,14 @@
+ 	int result;
+ 	char *text, *primary_text, *secondary_text, *formatted_name, *base_name;
+ 	GnomeVFSURI *file_uri, *parent_uri;
+-	gboolean is_merge, target_is_dir;
++	gboolean is_merge, target_is_dir, target_is_link;
+ 
+ 	nautilus_file_operations_progress_pause_timeout (transfer_info->progress_dialog);	
+ 
+ 	/* Handle special case files such as Trash, mount links and home directory */	
+-	if (is_special_link (progress_info->target_name)) {
++	target_is_link = is_special_link (progress_info->target_name);
++	if (target_is_link ||
++	    are_same_file (progress_info->source_name, progress_info->target_name)) {
+ 		formatted_name = extract_and_ellipsize_file_name_for_dialog
+ 			(parent_for_error_dialog (transfer_info),
+ 			 progress_info->target_name);
+@@ -1135,19 +1165,30 @@
+ 		if (transfer_info->kind == TRANSFER_MOVE) {
+ 			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.");
+ 		}
+-		
++		if (target_is_link) {
++			if (transfer_info->kind == TRANSFER_MOVE) {
++				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 {
++				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.");
++			}
++		} else {
++			if (transfer_info->kind == TRANSFER_MOVE) {
++				secondary_text = _("The name is already used for an item which is the same "
++						   "as the one you are trying to move.");
++			} else {
++				secondary_text = _("The name is already used for an item which is the same "
++						   "as the one you are trying to copy.");
++			}
++		}
++
+ 		eel_run_simple_dialog (parent_for_error_dialog (transfer_info),
+ 				       TRUE, GTK_MESSAGE_ERROR,
+ 				       primary_text, secondary_text,

Added: desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch (added)
+++ desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,13 @@
+Index: nautilus-2.16.3/src/file-manager/fm-directory-view.c
+===================================================================
+--- nautilus-2.16.3.orig/src/file-manager/fm-directory-view.c	2006-12-09 00:57:19.000000000 +0100
++++ nautilus-2.16.3/src/file-manager/fm-directory-view.c	2006-12-13 21:58:45.000000000 +0100
+@@ -7236,6 +7236,8 @@
+ 		uri = nautilus_file_get_activation_uri (file);
+ 		if (uri != NULL &&
+ 		    (eel_istr_has_prefix (uri, "ftp:") ||
++		     eel_istr_has_prefix (uri, "ssh:") ||
++		     eel_istr_has_prefix (uri, "sftp:") ||
+ 		     eel_istr_has_prefix (uri, "dav:") ||
+ 		     eel_istr_has_prefix (uri, "davs:"))) {
+ 			*show_connect = TRUE;

Added: desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch (added)
+++ desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,12 @@
+diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
+index f223bd7..74cb45c 100644
+--- a/src/file-manager/fm-directory-view.c
++++ b/src/file-manager/fm-directory-view.c
+@@ -1237,6 +1237,7 @@ action_show_hidden_files_callback (GtkAc
+ 	directory_view = FM_DIRECTORY_VIEW (callback_data);
+ 	
+ 	directory_view->details->show_hidden_files = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
++	directory_view->details->show_backup_files = directory_view->details->show_hidden_files;
+ 	
+ 	if (directory_view->details->show_hidden_files) {
+ 		mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_ENABLE;

Added: desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch (added)
+++ desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,40 @@
+Index: nautilus-2.16.3/src/nautilus-places-sidebar.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-places-sidebar.c	2006-09-14 10:24:30.000000000 +0200
++++ nautilus-2.16.3/src/nautilus-places-sidebar.c	2007-01-03 00:29:53.000000000 +0100
+@@ -453,9 +453,7 @@
+ }
+ 
+ static void
+-row_activated_callback (GtkTreeView *tree_view,
+-			GtkTreePath *path,
+-			GtkTreeViewColumn *column,
++cursor_changed_callback (GtkTreeView *tree_view,
+ 			gpointer user_data)
+ {
+ 	NautilusPlacesSidebar *sidebar;
+@@ -464,11 +462,8 @@
+ 	char *uri;
+ 	
+ 	sidebar = NAUTILUS_PLACES_SIDEBAR (user_data);
+-	model = gtk_tree_view_get_model (tree_view);
+-	
+-	if (!gtk_tree_model_get_iter (model, &iter, path)) {
+-		return;
+-	}
++
++	gtk_tree_selection_get_selected(gtk_tree_view_get_selection(tree_view), &model, &iter);
+ 
+ 	gtk_tree_model_get 
+ 		(model, &iter, PLACES_SIDEBAR_COLUMN_URI, &uri, -1);
+@@ -1543,8 +1538,8 @@
+ 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+ 
+ 	g_signal_connect_object
+-		(tree_view, "row_activated", 
+-		 G_CALLBACK (row_activated_callback), sidebar, 0);
++		(tree_view, "cursor_changed", 
++		 G_CALLBACK (cursor_changed_callback), sidebar, 0);
+ 
+ 
+ 	gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view),

Added: desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch (added)
+++ desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,148 @@
+Index: libnautilus-private/nautilus-monitor.c
+===================================================================
+--- libnautilus-private/nautilus-monitor.c.orig	2006-10-30 14:29:49.000000000 +0100
++++ libnautilus-private/nautilus-monitor.c	2007-01-30 23:04:30.000000000 +0100
+@@ -38,6 +38,13 @@
+ 	GnomeVFSMonitorHandle *handle;
+ };
+ 
++static gboolean has_desktop = TRUE;
++
++void nautilus_monitor_set_desktop(gboolean use_desktop)
++{
++	has_desktop = use_desktop;
++}
++
+ gboolean
+ nautilus_monitor_active (void)
+ {
+@@ -47,19 +54,22 @@
+ 	NautilusMonitor *monitor;
+ 
+ 	if (tried_monitor == FALSE) {	
+-		desktop_directory = nautilus_get_desktop_directory ();
+-		uri = gnome_vfs_get_uri_from_local_path (desktop_directory);
+-
+-		monitor = nautilus_monitor_directory (uri);
+-		monitor_success = (monitor != NULL);
++		if (has_desktop)
++		{
++			desktop_directory = nautilus_get_desktop_directory ();
++			uri = gnome_vfs_get_uri_from_local_path (desktop_directory);
++
++			monitor = nautilus_monitor_directory (uri);
++			monitor_success = (monitor != NULL);
++
++			if (monitor != NULL) {
++				nautilus_monitor_cancel (monitor);
++			}
+ 
+-		if (monitor != NULL) {
+-			nautilus_monitor_cancel (monitor);
++			g_free (desktop_directory);
++			g_free (uri);
+ 		}
+ 
+-		g_free (desktop_directory);
+-		g_free (uri);
+-
+ 		tried_monitor = TRUE;
+ 	}
+ 
+Index: libnautilus-private/nautilus-monitor.h
+===================================================================
+--- libnautilus-private/nautilus-monitor.h.orig	2002-02-21 20:26:47.000000000 +0100
++++ libnautilus-private/nautilus-monitor.h	2007-01-30 23:04:30.000000000 +0100
+@@ -30,6 +30,7 @@
+ 
+ typedef struct NautilusMonitor NautilusMonitor;
+ 
++void 			 nautilus_monitor_set_desktop (gboolean use_desktop);
+ gboolean         nautilus_monitor_active    (void);
+ NautilusMonitor *nautilus_monitor_file      (const char      *uri);
+ NautilusMonitor *nautilus_monitor_directory (const char      *uri);
+Index: src/nautilus-application.c
+===================================================================
+--- src/nautilus-application.c.orig	2006-11-07 11:44:15.000000000 +0100
++++ src/nautilus-application.c	2007-01-30 23:04:30.000000000 +0100
+@@ -237,7 +237,7 @@
+ }
+ 
+ static gboolean
+-check_required_directories (NautilusApplication *application)
++check_required_directories (NautilusApplication *application, gboolean no_desktop)
+ {
+ 	char *user_directory;
+ 	char *desktop_directory;
+@@ -250,20 +250,24 @@
+ 	
+ 	g_assert (NAUTILUS_IS_APPLICATION (application));
+ 
+-	user_directory = nautilus_get_user_directory ();
+-	desktop_directory = nautilus_get_desktop_directory ();
+-
+ 	directories = eel_string_list_new (TRUE);
+-	
++
++	user_directory = nautilus_get_user_directory ();
+ 	if (!g_file_test (user_directory, G_FILE_TEST_IS_DIR)) {
+ 		eel_string_list_insert (directories, user_directory);
+ 	}
+ 	g_free (user_directory);	    
+-	    
+-	if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) {
+-		eel_string_list_insert (directories, desktop_directory);
++	if (!no_desktop)
++	{
++		desktop_directory = nautilus_get_desktop_directory ();
++			
++		if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) {
++			eel_string_list_insert (directories, desktop_directory);
++		}
++		g_free (desktop_directory);
+ 	}
+-	g_free (desktop_directory);
++	else
++		nautilus_monitor_set_desktop(!no_desktop);
+ 
+ 	failed_count = eel_string_list_get_length (directories);
+ 
+@@ -392,7 +396,7 @@
+ }
+ 
+ static void
+-finish_startup (NautilusApplication *application)
++finish_startup (NautilusApplication *application, gboolean no_desktop)
+ {
+ 	/* initialize nautilus modules */
+ 	nautilus_module_init ();
+@@ -408,8 +412,9 @@
+ 	/* Make the desktop work with old Nautilus. */
+ 	migrate_old_nautilus_files ();
+ 
+-	/* Initialize the desktop link monitor singleton */
+-	nautilus_desktop_link_monitor_get ();
++	if (!no_desktop)
++		/* Initialize the desktop link monitor singleton */
++		nautilus_desktop_link_monitor_get ();
+ }
+ 
+ static void
+@@ -512,7 +517,7 @@
+ 	/* Check the user's ~/.nautilus directories and post warnings
+ 	 * if there are problems.
+ 	 */
+-	if (!kill_shell && !check_required_directories (application)) {
++	if (!kill_shell && !check_required_directories (application, no_desktop)) {
+ 		return;
+ 	}
+ 
+@@ -530,7 +535,7 @@
+ 		case Bonobo_ACTIVATION_REG_SUCCESS:
+ 			/* We are registered and all is right with the world. */
+ 			application->shell_registered = TRUE;
+-			finish_startup (application);
++			finish_startup (application, no_desktop);
+ 			message = NULL;
+ 			detailed_message = NULL;
+ 			break;

Added: desktop/unstable/nautilus/debian/patches/08_folder_handler.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/08_folder_handler.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/08_folder_handler.patch (added)
+++ desktop/unstable/nautilus/debian/patches/08_folder_handler.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,9 @@
+Index: nautilus-2.16.3/nautilus-folder-handler.desktop.in.in
+===================================================================
+--- nautilus-2.16.3.orig/nautilus-folder-handler.desktop.in.in	2007-02-17 00:16:34.000000000 +0100
++++ nautilus-2.16.3/nautilus-folder-handler.desktop.in.in	2007-02-17 00:17:12.000000000 +0100
+@@ -12,3 +12,4 @@
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Bugzilla-Version=@VERSION@
++OnlyShowIn=GNOME

Added: desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch (added)
+++ desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,108 @@
+Index: nautilus-2.16.3/src/nautilus-connect-server-dialog.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-connect-server-dialog.c	2007-02-25 00:49:53.000000000 +0100
++++ nautilus-2.16.3/src/nautilus-connect-server-dialog.c	2007-02-25 00:50:05.000000000 +0100
+@@ -29,13 +29,18 @@
+ #include <eel/eel-stock-dialogs.h>
+ #include <eel/eel-vfs-extensions.h>
+ #include <libgnomeui/gnome-help.h>
++#include <libgnomevfs/gnome-vfs-method.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <libgnomevfs/gnome-vfs-volume.h>
+ #include <glib/gi18n.h>
++#include <gtk/gtkcelllayout.h>
++#include <gtk/gtkcellrenderertext.h>
+ #include <gtk/gtkhbox.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtktable.h>
++#include <gtk/gtktreemodel.h>
+ #include <gtk/gtklabel.h>
++#include <gtk/gtkliststore.h>
+ #include <gtk/gtkstock.h>
+ #include <gtk/gtkcombobox.h>
+ #include "nautilus-location-entry.h"
+@@ -174,9 +179,12 @@
+ 	char *name;
+ 	char *icon;
+ 	int index;
++	GtkTreeIter iter;
+ 	
+ 	/* Get our method info */
+-	index = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->details->type_combo));
++	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->details->type_combo), &iter);
++	gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->details->type_combo)),
++			    &iter, 0, &index, -1);
+ 	g_assert (index < G_N_ELEMENTS (methods) && index >= 0);
+ 	meth = &(methods[index]);
+ 
+@@ -419,9 +427,12 @@
+ 	struct MethodInfo *meth;
+ 	int index, i;
+ 	GtkWidget *label, *table;
+-
++	GtkTreeIter iter;
++	
+ 	/* Get our method info */
+-	index = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->details->type_combo));
++	gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->details->type_combo), &iter);
++	gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->details->type_combo)),
++			    &iter, 0, &index, -1);
+ 	g_assert (index < G_N_ELEMENTS (methods) && index >= 0);
+ 	meth = &(methods[index]);
+ 
+@@ -798,6 +809,8 @@
+ 	GtkWidget *combo;
+ 	GtkWidget *hbox;
+ 	GtkWidget *vbox;
++	GtkListStore *store;
++	GtkCellRenderer *renderer;
+ 	int i;
+ 	
+ 	dialog->details = g_new0 (NautilusConnectServerDialogDetails, 1);
+@@ -825,15 +838,42 @@
+ 	gtk_box_pack_start (GTK_BOX (hbox),
+ 			    label, FALSE, FALSE, 0);
+ 
+-	dialog->details->type_combo = combo = gtk_combo_box_new_text ();
+-	
++	dialog->details->type_combo = combo = gtk_combo_box_new ();
++
++	/* each row contains: method index, textual description */
++	store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
++	gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (store));
++	g_object_unref (G_OBJECT (store));
++
++	renderer = gtk_cell_renderer_text_new ();
++	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
++	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 1);
++
+ 	for (i = 0; i < G_N_ELEMENTS (methods); i++) {
+-		gtk_combo_box_append_text (GTK_COMBO_BOX (combo), get_method_description (&(methods[i])));
++		GtkTreeIter iter;
++
++		if (methods[i].method != NULL && gnome_vfs_method_get (methods[i].method) == NULL) {
++			/* skip methods that don't have corresponding GnomeVFSMethods */
++			continue;
++		}
++
++		gtk_list_store_append (store, &iter);
++		gtk_list_store_set (store, &iter,
++				    0, i,
++				    1, get_method_description (&(methods[i])),
++				    -1);
++
++
+ 		if (methods[i].flags & DEFAULT_METHOD) {
+-			gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
++			gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
+ 		}
+ 	}
+ 
++	if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo)) < 0) {
++		/* default method not available, use any other */
++		gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
++	}
++
+ 	gtk_widget_show (combo);
+ 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+ 	gtk_box_pack_start (GTK_BOX (hbox),

Added: desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch (added)
+++ desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch Tue Apr 24 20:38:00 2007
@@ -1,0 +1,119 @@
+Index: nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/apps_nautilus_preferences.schemas.in	2006-06-15 11:38:40.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in	2007-03-03 22:39:32.000000000 +0100
+@@ -720,6 +720,21 @@
+       </locale>
+     </schema>
+ 
++     <schema>
++      <key>/schemas/apps/nautilus/preferences/location_in_title_bar</key>
++      <applyto>/apps/nautilus/preferences/location_in_title_bar</applyto>
++      <owner>nautilus</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++         <short>Show current location in title bar</short>
++         <long>
++         If set to true, windows will have the full location displayed
++         in their title bar. Otherwise it will only show the folder name.
++         </long>
++      </locale>
++    </schema>
++
+     <schema>
+       <key>/schemas/apps/nautilus/preferences/side_pane_view</key>
+       <applyto>/apps/nautilus/preferences/side_pane_view</applyto>
+Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.c	2006-07-21 19:18:56.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c	2007-03-03 22:40:31.000000000 +0100
+@@ -376,6 +376,10 @@
+ 	  PREFERENCE_BOOLEAN,
+ 	  GINT_TO_POINTER (TRUE)
+ 	},
++	{ NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR,
++	  PREFERENCE_BOOLEAN,
++	  GINT_TO_POINTER (TRUE)
++	},
+ 	{ NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
+ 	  PREFERENCE_BOOLEAN,
+ 	  GINT_TO_POINTER (TRUE)
+Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h
+===================================================================
+--- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.h	2006-07-21 19:18:56.000000000 +0200
++++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h	2007-03-03 22:41:48.000000000 +0100
+@@ -84,6 +84,7 @@
+ #define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR		"preferences/start_with_location_bar"
+ #define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY		"preferences/always_use_location_entry"
+ #define NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR		"preferences/start_with_status_bar"
++#define NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR		"preferences/location_in_title_bar"
+ #define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR		 	"preferences/start_with_sidebar"
+ #define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR			"preferences/start_with_toolbar"
+ #define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW                     "preferences/side_pane_view"
+Index: nautilus-2.16.3/src/nautilus-navigation-window.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-navigation-window.c	2006-10-02 12:53:45.000000000 +0200
++++ nautilus-2.16.3/src/nautilus-navigation-window.c	2007-03-03 23:20:34.000000000 +0100
+@@ -895,20 +895,32 @@
+ static gboolean
+ real_set_title (NautilusWindow *window, const char *title)
+ {
+-	char *full_title;
+-	char *window_title;
+ 	gboolean changed;
+ 
+ 	changed = EEL_CALL_PARENT_WITH_RETURN_VALUE
+ 		(NAUTILUS_WINDOW_CLASS, set_title, (window, title));
+ 
+ 	if (changed) {
++		char *full_title;
++		char *window_title;
++		char *tmp_title = NULL;
++		char *uri = NULL;
++		char *location;
++
++		if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
++		    (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
++		    (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
++			title = tmp_title = g_strdup_printf("%s (%s)",title,location);
++			g_free (location);
++		}
+ 		full_title = g_strdup_printf (_("%s - File Browser"), title);
+ 
+ 		window_title = eel_str_middle_truncate (full_title, MAX_TITLE_LENGTH);
+ 		gtk_window_set_title (GTK_WINDOW (window), window_title);
+ 		g_free (window_title);
+ 		g_free (full_title);
++		g_free (tmp_title);
++		g_free (uri);
+ 	}
+ 
+ 	return changed;
+Index: nautilus-2.16.3/src/nautilus-spatial-window.c
+===================================================================
+--- nautilus-2.16.3.orig/src/nautilus-spatial-window.c	2006-08-07 12:34:31.000000000 +0200
++++ nautilus-2.16.3/src/nautilus-spatial-window.c	2007-03-03 23:20:19.000000000 +0100
+@@ -424,10 +424,22 @@
+ 		gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
+ 	} else if (changed) {
+ 		char *window_title;
++		char *tmp_title = NULL;
++		char *uri = NULL;
++		char *location;
++
++		if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
++		    (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
++		    (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
++			title = tmp_title = g_strdup_printf("%s (%s)",title,location);
++			g_free (location);
++		}
+ 
+ 		window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
+ 		gtk_window_set_title (GTK_WINDOW (window), window_title);
+ 		g_free (window_title);
++		g_free (tmp_title);
++		g_free (uri);
+ 	}
+ 
+ 	return changed;

Modified: desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch Tue Apr 24 20:38:00 2007
@@ -1,6 +1,7 @@
-diff -Nur nautilus-2.14.3/po/af.po nautilus-2.14.3.new/po/af.po
---- nautilus-2.14.3/po/af.po	2005-02-10 12:18:48.000000000 +0100
-+++ nautilus-2.14.3.new/po/af.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/af.po
+===================================================================
+--- nautilus-2.16.3.orig/po/af.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/af.po	2006-12-13 22:40:11.000000000 +0100
 @@ -7475,3 +7475,16 @@
  
  #~ msgid "Find:"
@@ -18,9 +19,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/am.po nautilus-2.14.3.new/po/am.po
---- nautilus-2.14.3/po/am.po	2005-02-10 12:18:48.000000000 +0100
-+++ nautilus-2.14.3.new/po/am.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/am.po
+===================================================================
+--- nautilus-2.16.3.orig/po/am.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/am.po	2006-12-13 22:40:12.000000000 +0100
 @@ -6696,3 +6696,16 @@
  
  #~ msgid "_Remove Theme..."
@@ -38,13 +40,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/ar.po nautilus-2.14.3.new/po/ar.po
---- nautilus-2.14.3/po/ar.po	2005-02-10 12:18:49.000000000 +0100
-+++ nautilus-2.14.3.new/po/ar.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6572,3 +6572,16 @@
- 
- #~ msgid "Try to fit in window"
- #~ msgstr "Ù
ØØ§ÙˆÙ„Ø© Ø§Ù„Ù
Ù„Ø§Ø¦Ù
Ø© ÙÙŠ Ø§Ù„Ù†Ø§ÙØ°Ø©"
+Index: nautilus-2.16.3/po/ar.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ar.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/ar.po	2006-12-13 22:40:12.000000000 +0100
+@@ -5885,3 +5885,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Ø§Ø¹Ø±Ø¶ Ø®ÙˆØ§Ø¯Ù
 Ø´Ø¨ÙƒØªÙƒ ÙÙŠ Ù
Ø¯ÙŠØ± Ø§Ù„Ù
Ù„ÙØ§Øª Ù†ÙˆØªÙ„Ø³"
+ 
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -58,9 +61,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø¹Ø¯Ù
 Ø¥Ø²Ù„Ø© Ø§Ù„Ø¬Ù‡Ø§Ø² Ø£Ø«Ù†Ø§Ø¡ Ù‡Ø°Ù‡ Ø§Ù„Ø¹Ù
Ù„ÙŠØ©"
-diff -Nur nautilus-2.14.3/po/az.po nautilus-2.14.3.new/po/az.po
---- nautilus-2.14.3/po/az.po	2005-02-10 12:18:49.000000000 +0100
-+++ nautilus-2.14.3.new/po/az.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/az.po
+===================================================================
+--- nautilus-2.16.3.orig/po/az.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/az.po	2006-12-13 22:40:12.000000000 +0100
 @@ -6606,3 +6606,16 @@
  
  #~ msgid "Try to fit in window"
@@ -78,9 +82,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/be.po nautilus-2.14.3.new/po/be.po
---- nautilus-2.14.3/po/be.po	2006-02-26 12:35:00.000000000 +0100
-+++ nautilus-2.14.3.new/po/be.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/be.po
+===================================================================
+--- nautilus-2.16.3.orig/po/be.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/be.po	2006-12-13 22:40:12.000000000 +0100
 @@ -6074,3 +6074,16 @@
  
  #~ msgid "View Failed"
@@ -98,10 +103,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/bg.po nautilus-2.14.3.new/po/bg.po
---- nautilus-2.14.3/po/bg.po	2006-07-31 22:32:04.000000000 +0200
-+++ nautilus-2.14.3.new/po/bg.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5809,3 +5809,16 @@
+Index: nautilus-2.16.3/po/bg.po
+===================================================================
+--- nautilus-2.16.3.orig/po/bg.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/bg.po	2006-12-13 22:40:12.000000000 +0100
+@@ -5976,3 +5976,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
  msgstr "ÐŸÑ€ÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð²Ð°ÑˆÐ¸Ñ‚Ðµ Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¸ ÑÑŠÑ€Ð²ÑŠÑ€Ð¸ Ð²ÑŠÐ² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸Ñ Ð¼ÐµÐ½Ð¸Ð´Ð¶ÑŠÑ€ Nautilus"
@@ -118,9 +124,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ÐœÐ¾Ð»Ð°, Ð½Ðµ Ð¿Ñ€ÐµÐ¼Ð°Ñ
Ð²Ð°Ð¹Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾Ñ‚Ð¾, Ð´Ð¾ÐºÐ°Ñ‚Ð¾ ÑÐµ Ð¸Ð·Ð²ÑŠÑ€ÑˆÐ²Ð° Ñ‚Ð°Ð·Ð¸ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ!"
-diff -Nur nautilus-2.14.3/po/bn.po nautilus-2.14.3.new/po/bn.po
---- nautilus-2.14.3/po/bn.po	2006-03-13 07:01:04.000000000 +0100
-+++ nautilus-2.14.3.new/po/bn.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/bn.po
+===================================================================
+--- nautilus-2.16.3.orig/po/bn.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/bn.po	2006-12-13 22:40:12.000000000 +0100
 @@ -6156,3 +6156,16 @@
  
  #~ msgid "View Failed"
@@ -138,10 +145,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/br.po nautilus-2.14.3.new/po/br.po
---- nautilus-2.14.3/po/br.po	2006-04-15 11:52:25.000000000 +0200
-+++ nautilus-2.14.3.new/po/br.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5528,3 +5528,16 @@
+Index: nautilus-2.16.3/po/br.po
+===================================================================
+--- nautilus-2.16.3.orig/po/br.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/br.po	2006-12-13 22:40:12.000000000 +0100
+@@ -5658,3 +5658,16 @@
  
  #~ msgid "Documents icon visible on desktop"
  #~ msgstr "ArlunioÃ¹ an dielloÃ¹ hewel war ar burev"
@@ -158,9 +166,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/bs.po nautilus-2.14.3.new/po/bs.po
---- nautilus-2.14.3/po/bs.po	2005-02-10 12:18:49.000000000 +0100
-+++ nautilus-2.14.3.new/po/bs.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/bs.po
+===================================================================
+--- nautilus-2.16.3.orig/po/bs.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/bs.po	2006-12-13 22:40:12.000000000 +0100
 @@ -6864,3 +6864,16 @@
  
  #~ msgid "Example:"
@@ -178,10 +187,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/ca.po nautilus-2.14.3.new/po/ca.po
---- nautilus-2.14.3/po/ca.po	2006-07-31 22:32:06.000000000 +0200
-+++ nautilus-2.14.3.new/po/ca.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6522,3 +6522,16 @@
+Index: nautilus-2.16.3/po/ca.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ca.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/ca.po	2006-12-13 22:40:12.000000000 +0100
+@@ -6769,3 +6769,16 @@
  
  #~ msgid "Can't Delete Volume"
  #~ msgstr "No es pot suprimir el volum"
@@ -198,14 +208,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/cs.po nautilus-2.14.3.new/po/cs.po
---- nautilus-2.14.3/po/cs.po	2006-07-31 22:32:07.000000000 +0200
-+++ nautilus-2.14.3.new/po/cs.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6119,3 +6119,16 @@
- 
- #~ msgid "Web"
- #~ msgstr "WWW"
-+
+Index: nautilus-2.16.3/po/cs.po
+===================================================================
+--- nautilus-2.16.3.orig/po/cs.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/cs.po	2006-12-13 22:40:12.000000000 +0100
+@@ -5936,3 +5936,15 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Zobrazit vaÅ¡e sÃÅ¥ovÃ© servery ve sprÃ¡vci souborÅ¯ Nautilus"
+ 
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
 +msgstr "OdebÃrÃ¡ se zaÅ™ÃzenÃ"
@@ -218,10 +228,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ProsÃm neodpojujte zaÅ™ÃzenÃ bÄ›hem tÃ©to operace."
-diff -Nur nautilus-2.14.3/po/cy.po nautilus-2.14.3.new/po/cy.po
---- nautilus-2.14.3/po/cy.po	2006-05-19 23:09:45.000000000 +0200
-+++ nautilus-2.14.3.new/po/cy.po	2006-11-30 13:44:08.000000000 +0100
-@@ -8715,3 +8715,16 @@
+Index: nautilus-2.16.3/po/cy.po
+===================================================================
+--- nautilus-2.16.3.orig/po/cy.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/cy.po	2006-12-13 22:40:12.000000000 +0100
+@@ -8711,3 +8711,16 @@
  
  #~ msgid "New _Window"
  #~ msgstr "_Ffenestr Newydd"
@@ -238,9 +249,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/da.po nautilus-2.14.3.new/po/da.po
---- nautilus-2.14.3/po/da.po	2006-03-28 00:17:32.000000000 +0200
-+++ nautilus-2.14.3.new/po/da.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/da.po
+===================================================================
+--- nautilus-2.16.3.orig/po/da.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/da.po	2006-12-13 22:40:12.000000000 +0100
 @@ -7996,3 +7996,16 @@
  #~ "\n"
  #~ "/sbin/chkconfig --level 345 crond on\n"
@@ -258,13 +270,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Fjern ikke enheden mens denne handling foretages"
-diff -Nur nautilus-2.14.3/po/de.po nautilus-2.14.3.new/po/de.po
---- nautilus-2.14.3/po/de.po	2006-04-12 21:20:55.000000000 +0200
-+++ nautilus-2.14.3.new/po/de.po	2006-11-30 13:44:08.000000000 +0100
-@@ -7280,3 +7280,16 @@
+Index: nautilus-2.16.3/po/de.po
+===================================================================
+--- nautilus-2.16.3.orig/po/de.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/de.po	2006-12-13 22:40:13.000000000 +0100
+@@ -7493,3 +7493,16 @@
  
  #~ msgid "_View as..."
- #~ msgstr "Ansicht aus_wÃ¤hlen..."
+ #~ msgstr "Ansicht aus_wÃ¤hlen â€¦"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -278,10 +291,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Bitte entfernen Sie das GerÃ¤t nicht, solange diese Aktion lÃ¤uft."
-diff -Nur nautilus-2.14.3/po/el.po nautilus-2.14.3.new/po/el.po
---- nautilus-2.14.3/po/el.po	2006-04-08 19:53:54.000000000 +0200
-+++ nautilus-2.14.3.new/po/el.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6072,3 +6072,16 @@
+Index: nautilus-2.16.3/po/el.po
+===================================================================
+--- nautilus-2.16.3.orig/po/el.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/el.po	2006-12-13 22:40:13.000000000 +0100
+@@ -6245,3 +6245,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Ï‰Î½ ÎµÎ¾Ï
Ï€Î·ÏÎµÏ„Î·Ï„ÏŽÎ½ Î´Î¹ÎºÏ„ÏÎ¿Ï
 ÏƒÏ„Î¿ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Ï„Î¿Ï
 ÎÎ±Ï
Ï„Î¯Î»Î¿Ï
"
@@ -298,9 +312,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/en_CA.po nautilus-2.14.3.new/po/en_CA.po
---- nautilus-2.14.3/po/en_CA.po	2006-02-01 02:47:37.000000000 +0100
-+++ nautilus-2.14.3.new/po/en_CA.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/en_CA.po
+===================================================================
+--- nautilus-2.16.3.orig/po/en_CA.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/en_CA.po	2006-12-13 22:40:13.000000000 +0100
 @@ -5748,3 +5748,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
@@ -318,10 +333,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/en_GB.po nautilus-2.14.3.new/po/en_GB.po
---- nautilus-2.14.3/po/en_GB.po	2005-04-19 21:21:55.000000000 +0200
-+++ nautilus-2.14.3.new/po/en_GB.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5612,3 +5612,17 @@
+Index: nautilus-2.16.3/po/en_GB.po
+===================================================================
+--- nautilus-2.16.3.orig/po/en_GB.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/en_GB.po	2006-12-13 22:40:13.000000000 +0100
+@@ -5491,3 +5491,17 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "View your network servers in the Nautilus file manager"
  
@@ -339,12 +355,13 @@
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Please do not remove the device while this operation is in progress."
 +
-diff -Nur nautilus-2.14.3/po/es.po nautilus-2.14.3.new/po/es.po
---- nautilus-2.14.3/po/es.po	2006-05-19 17:02:42.000000000 +0200
-+++ nautilus-2.14.3.new/po/es.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6457,3 +6457,16 @@
- msgid "View your network servers in the Nautilus file manager"
- msgstr "Ver sus servidores de red en el administrador de archivos Nautilus"
+Index: nautilus-2.16.3/po/es.po
+===================================================================
+--- nautilus-2.16.3.orig/po/es.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/es.po	2006-12-13 22:40:13.000000000 +0100
+@@ -6637,3 +6637,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Ver los servidores de la red en el administrador de archivos Nautilus"
  
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
@@ -359,30 +376,32 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/et.po nautilus-2.14.3.new/po/et.po
---- nautilus-2.14.3/po/et.po	2006-07-31 22:32:08.000000000 +0200
-+++ nautilus-2.14.3.new/po/et.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5662,3 +5662,16 @@
+Index: nautilus-2.16.3/po/et.po
+===================================================================
+--- nautilus-2.16.3.orig/po/et.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/et.po	2006-12-13 22:40:13.000000000 +0100
+@@ -5962,3 +5962,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
- msgstr "Vaata oma vÃµrgu servereid Nautiluse failihalduris."
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/eu.po nautilus-2.14.3.new/po/eu.po
---- nautilus-2.14.3/po/eu.po	2006-04-20 18:22:54.000000000 +0200
-+++ nautilus-2.14.3.new/po/eu.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6041,3 +6041,16 @@
+ msgstr "VÃµrguserverite vaatamine Nautiluse failihalduris"
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/eu.po
+===================================================================
+--- nautilus-2.16.3.orig/po/eu.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/eu.po	2006-12-13 22:40:13.000000000 +0100
+@@ -6215,3 +6215,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Ikusi zure sareko zerbitzariak Nautilus fitxategi-kudeatzailean"
  
@@ -399,9 +418,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/fa.po nautilus-2.14.3.new/po/fa.po
---- nautilus-2.14.3/po/fa.po	2005-08-20 13:15:42.000000000 +0200
-+++ nautilus-2.14.3.new/po/fa.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/fa.po
+===================================================================
+--- nautilus-2.16.3.orig/po/fa.po	2006-12-13 21:59:17.000000000 +0100
++++ nautilus-2.16.3/po/fa.po	2006-12-13 22:40:13.000000000 +0100
 @@ -6482,3 +6482,16 @@
  
  #~ msgid "Audio CD"
@@ -419,10 +439,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ù„Ø·ÙØ§ Ø¯Ø± Ø¬Ø±ÛŒØ§Ù† Ø¹Ù
Ù„ÛŒØ§ØªØŒ Ø§ØªØµØ§Ù„ Ø¯Ø³ØªÚ¯Ø§Ù‡ Ø±Ø§ Ù‚Ø·Ø¹ Ù†Ú©Ù†ÛŒØ¯."
-diff -Nur nautilus-2.14.3/po/fi.po nautilus-2.14.3.new/po/fi.po
---- nautilus-2.14.3/po/fi.po	2006-05-22 12:26:13.000000000 +0200
-+++ nautilus-2.14.3.new/po/fi.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6607,3 +6607,16 @@
+Index: nautilus-2.16.3/po/fi.po
+===================================================================
+--- nautilus-2.16.3.orig/po/fi.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/fi.po	2006-12-13 22:40:13.000000000 +0100
+@@ -6807,3 +6807,16 @@
  
  #~ msgid "Files copied:"
  #~ msgstr "Tiedostoja kopioitunut:"
@@ -439,10 +460,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ole hyvÃ¤ Ã¤lÃ¤kÃ¤ poista asemaa kun tÃ¤mÃ¤ operaatio on kÃ¤ynnissÃ¤."
-diff -Nur nautilus-2.14.3/po/fr.po nautilus-2.14.3.new/po/fr.po
---- nautilus-2.14.3/po/fr.po	2006-07-31 22:32:09.000000000 +0200
-+++ nautilus-2.14.3.new/po/fr.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5904,3 +5904,16 @@
+Index: nautilus-2.16.3/po/fr.po
+===================================================================
+--- nautilus-2.16.3.orig/po/fr.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/fr.po	2006-12-13 22:40:13.000000000 +0100
+@@ -6070,3 +6070,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Affiche vos serveurs rÃ©seaux dans le gestionnaire de fichiers Nautilus"
@@ -459,9 +481,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/ga.po nautilus-2.14.3.new/po/ga.po
---- nautilus-2.14.3/po/ga.po	2005-02-10 12:18:56.000000000 +0100
-+++ nautilus-2.14.3.new/po/ga.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ga.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ga.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ga.po	2006-12-13 22:40:13.000000000 +0100
 @@ -6266,3 +6266,16 @@
  
  #~ msgid "_Write to CD"
@@ -479,10 +502,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/gl.po nautilus-2.14.3.new/po/gl.po
---- nautilus-2.14.3/po/gl.po	2006-05-20 10:32:30.000000000 +0200
-+++ nautilus-2.14.3.new/po/gl.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5782,3 +5782,16 @@
+Index: nautilus-2.16.3/po/gl.po
+===================================================================
+--- nautilus-2.16.3.orig/po/gl.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/gl.po	2006-12-13 22:40:13.000000000 +0100
+@@ -5943,3 +5943,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Ver os servidores de rede no xestor de ficheiros Nautilus"
  
@@ -499,10 +523,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Non saque o dispositivo mentres se realiza esta operaciÃ³n."
-diff -Nur nautilus-2.14.3/po/gu.po nautilus-2.14.3.new/po/gu.po
---- nautilus-2.14.3/po/gu.po	2006-03-20 08:23:43.000000000 +0100
-+++ nautilus-2.14.3.new/po/gu.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5698,3 +5698,16 @@
+Index: nautilus-2.16.3/po/gu.po
+===================================================================
+--- nautilus-2.16.3.orig/po/gu.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/gu.po	2006-12-13 22:40:13.000000000 +0100
+@@ -5877,3 +5877,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "àª¨à«‹àªŸàª¿àª²àª¸ àª«àª¾àª‡àª² àªµà«àª¯àªµàª¸à«àª¥àª¾àªªàª•àª®àª¾àª‚ àª¤àª®àª¾àª°àª¾ àª¨à«‡àªŸàªµàª°à«àª• àª¸àª°à«àªµàª°àª¨à«‡ àªœà«àª“"
  
@@ -519,9 +544,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/he.po nautilus-2.14.3.new/po/he.po
---- nautilus-2.14.3/po/he.po	2006-04-22 10:46:22.000000000 +0200
-+++ nautilus-2.14.3.new/po/he.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/he.po
+===================================================================
+--- nautilus-2.16.3.orig/po/he.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/he.po	2006-12-13 22:40:14.000000000 +0100
 @@ -6531,3 +6531,16 @@
  
  #~ msgid "Nautilus file manager search results list view"
@@ -539,10 +565,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/hi.po nautilus-2.14.3.new/po/hi.po
---- nautilus-2.14.3/po/hi.po	2006-03-08 10:41:55.000000000 +0100
-+++ nautilus-2.14.3.new/po/hi.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5833,3 +5833,16 @@
+Index: nautilus-2.16.3/po/hi.po
+===================================================================
+--- nautilus-2.16.3.orig/po/hi.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/hi.po	2006-12-13 22:40:14.000000000 +0100
+@@ -6012,3 +6012,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "à¤¨à¥‰à¤Ÿà¤¿à¤²à¤¸ à¤«à¤¼à¤¾à¤‡à¤² à¤ªà¥à¤°à¤¬à¤‚à¤§à¤• à¤®à¥‡à¤‚ à¤
à¤ªà¤¨à¥‡ à¤¨à¥‡à¤Ÿà¤µà¤°à¥à¤• à¤¸à¤°à¥à¤µà¤°à¥à¤¸ à¤¦à¥‡à¤–à¥‡à¤‚"
  
@@ -559,9 +586,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/hr.po nautilus-2.14.3.new/po/hr.po
---- nautilus-2.14.3/po/hr.po	2005-02-10 12:18:56.000000000 +0100
-+++ nautilus-2.14.3.new/po/hr.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/hr.po
+===================================================================
+--- nautilus-2.16.3.orig/po/hr.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/hr.po	2006-12-13 22:40:14.000000000 +0100
 @@ -6926,3 +6926,16 @@
  
  #~ msgid "Error while moving. "
@@ -579,10 +607,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Molim vas da ne uklanjate ureÄ‘aj dok je operacija u tijeku."
-diff -Nur nautilus-2.14.3/po/hu.po nautilus-2.14.3.new/po/hu.po
---- nautilus-2.14.3/po/hu.po	2006-07-31 22:32:09.000000000 +0200
-+++ nautilus-2.14.3.new/po/hu.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5792,3 +5792,16 @@
+Index: nautilus-2.16.3/po/hu.po
+===================================================================
+--- nautilus-2.16.3.orig/po/hu.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/hu.po	2006-12-13 22:40:14.000000000 +0100
+@@ -5943,3 +5943,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "HÃ¡lÃ³zati kiszolgÃ¡lÃ³k megtekintÃ©se a Nautilus fÃ¡jlkezelÅ‘ben"
  
@@ -599,10 +628,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ne tÃ¡volÃtsa el az eszkÃ¶zt, amÃg ez a mÅ±velet folyamatban van!"
-diff -Nur nautilus-2.14.3/po/id.po nautilus-2.14.3.new/po/id.po
---- nautilus-2.14.3/po/id.po	2006-05-08 05:45:46.000000000 +0200
-+++ nautilus-2.14.3.new/po/id.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6112,3 +6112,16 @@
+Index: nautilus-2.16.3/po/id.po
+===================================================================
+--- nautilus-2.16.3.orig/po/id.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/id.po	2006-12-13 22:40:14.000000000 +0100
+@@ -6347,3 +6347,16 @@
  
  #~ msgid "View Failed"
  #~ msgstr "Tampilan Gagal"
@@ -619,9 +649,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/is.po nautilus-2.14.3.new/po/is.po
---- nautilus-2.14.3/po/is.po	2005-02-10 12:18:57.000000000 +0100
-+++ nautilus-2.14.3.new/po/is.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/is.po
+===================================================================
+--- nautilus-2.16.3.orig/po/is.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/is.po	2006-12-13 22:40:14.000000000 +0100
 @@ -7226,3 +7226,16 @@
  
  #~ msgid "Find:"
@@ -639,13 +670,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ekki fjarlÃ¦gja tÃ¦kiÃ° Ã¡ meÃ°an Ã¡ Ã¾essari stendur."
-diff -Nur nautilus-2.14.3/po/it.po nautilus-2.14.3.new/po/it.po
---- nautilus-2.14.3/po/it.po	2006-03-18 13:33:13.000000000 +0100
-+++ nautilus-2.14.3.new/po/it.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5899,3 +5899,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
- msgstr "Mostra i server della propria rete nel file manager Nautilus"
+Index: nautilus-2.16.3/po/it.po
+===================================================================
+--- nautilus-2.16.3.orig/po/it.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/it.po	2006-12-13 22:40:14.000000000 +0100
+@@ -6079,3 +6079,16 @@
+ 
+ #~ msgid "Always use _text-entry location bar"
+ #~ msgstr "Usare sempre la barra di posizione come campo di _testo"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -659,29 +691,31 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Non rimuovere il dispositivo mentre questa operazione Ã¨ in corso."
-diff -Nur nautilus-2.14.3/po/ja.po nautilus-2.14.3.new/po/ja.po
---- nautilus-2.14.3/po/ja.po	2006-04-12 05:56:49.000000000 +0200
-+++ nautilus-2.14.3.new/po/ja.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5759,3 +5759,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
- msgstr "Nautilus ã§ãŠä½¿ã„ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚µãƒ¼ãƒã‚’è¡¨ç¤ºã—ã¾ã™"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/ka.po nautilus-2.14.3.new/po/ka.po
---- nautilus-2.14.3/po/ka.po	2006-04-18 13:08:46.000000000 +0200
-+++ nautilus-2.14.3.new/po/ka.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ja.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ja.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ja.po	2006-12-13 22:40:14.000000000 +0100
+@@ -5969,3 +5969,16 @@
+ 
+ #~ msgid "Always use _text-entry location bar"
+ #~ msgstr "å¸¸ã«ãƒ†ã‚ã‚¹ãƒˆå
¥åŠ›å½¢å¼ã®å ´æ‰€ãƒãƒ¼ã«ã™ã‚‹(_T)"
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/ka.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ka.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ka.po	2006-12-13 22:40:14.000000000 +0100
 @@ -5795,3 +5795,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "áƒ“áƒáƒáƒ—áƒ•áƒáƒšáƒ˜áƒ”áƒ áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¥áƒ¡áƒ”áƒšáƒ£áƒ áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ˜ áƒœáƒáƒ£áƒ¢áƒ˜áƒšáƒ£áƒ¡ áƒ¤áƒáƒ˜áƒš áƒ›áƒ”áƒœáƒ”áƒ¯áƒ”áƒ áƒ¨áƒ˜"
@@ -699,9 +733,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/km.po nautilus-2.14.3.new/po/km.po
---- nautilus-2.14.3/po/km.po	2006-03-02 16:27:35.000000000 +0100
-+++ nautilus-2.14.3.new/po/km.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/km.po
+===================================================================
+--- nautilus-2.16.3.orig/po/km.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/km.po	2006-12-13 22:40:14.000000000 +0100
 @@ -5531,3 +5531,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
@@ -719,13 +754,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/ko.po nautilus-2.14.3.new/po/ko.po
---- nautilus-2.14.3/po/ko.po	2006-04-10 18:22:31.000000000 +0200
-+++ nautilus-2.14.3.new/po/ko.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5674,3 +5674,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
- msgstr "ë
¸í‹¸ëŸ¬ìŠ¤ íŒŒì¼ ê´€ë¦¬ìžì—ì„œ ë„¤íŠ¸ì›Œí¬ ì„œë²„ë¥¼ ë´
ë‹ˆë‹¤"
+Index: nautilus-2.16.3/po/ko.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ko.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ko.po	2006-12-13 22:40:14.000000000 +0100
+@@ -5887,3 +5887,16 @@
+ 
+ #~ msgid "Number view:"
+ #~ msgstr "ìˆ«ìž ë³´ê¸°:"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -739,9 +775,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ì´ ë™ìž‘ì„ í•˜ëŠ” ë™ì•ˆ ìž¥ì¹˜ë¥¼ ë¹¼ì§€ ë§ˆì‹ì‹œì˜¤."
-diff -Nur nautilus-2.14.3/po/ku.po nautilus-2.14.3.new/po/ku.po
---- nautilus-2.14.3/po/ku.po	2006-01-30 01:58:43.000000000 +0100
-+++ nautilus-2.14.3.new/po/ku.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ku.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ku.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ku.po	2006-12-13 22:40:14.000000000 +0100
 @@ -5637,3 +5637,16 @@
  
  #~ msgid "Select an icon"
@@ -759,9 +796,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/li.po nautilus-2.14.3.new/po/li.po
---- nautilus-2.14.3/po/li.po	2005-02-10 12:19:01.000000000 +0100
-+++ nautilus-2.14.3.new/po/li.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/li.po
+===================================================================
+--- nautilus-2.16.3.orig/po/li.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/li.po	2006-12-13 22:40:15.000000000 +0100
 @@ -8662,3 +8662,16 @@
  
  #~ msgid "Copy selected text to the clipboard"
@@ -779,13 +817,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/lt.po nautilus-2.14.3.new/po/lt.po
---- nautilus-2.14.3/po/lt.po	2006-07-31 22:32:10.000000000 +0200
-+++ nautilus-2.14.3.new/po/lt.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5861,3 +5861,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
- msgstr "Rodyti tinkle esanÄius serverius Nautilus rinkmenÅ³ narÅ¡yklÄ—je"
+Index: nautilus-2.16.3/po/lt.po
+===================================================================
+--- nautilus-2.16.3.orig/po/lt.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/lt.po	2006-12-13 22:40:15.000000000 +0100
+@@ -5605,3 +5605,16 @@
+ #~ msgid "Number view:"
+ #~ msgstr "SkaitinÄ— iÅ¡raiÅ¡ka:"
+ 
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -799,29 +838,31 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "NeiÅ¡imkite Ä¯renginio, kol vykdoma Å¡i operacija:"
-diff -Nur nautilus-2.14.3/po/lv.po nautilus-2.14.3.new/po/lv.po
---- nautilus-2.14.3/po/lv.po	2006-07-31 22:32:10.000000000 +0200
-+++ nautilus-2.14.3.new/po/lv.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5787,3 +5787,16 @@
- #: ../src/network-scheme.desktop.in.h:2
+Index: nautilus-2.16.3/po/lv.po
+===================================================================
+--- nautilus-2.16.3.orig/po/lv.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/lv.po	2006-12-13 22:40:15.000000000 +0100
+@@ -5920,3 +5920,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "SkatÄ«t jÅ«su tÄ«kla serverus Nautilus failu pÄvaldniekÄ"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/mi.po nautilus-2.14.3.new/po/mi.po
---- nautilus-2.14.3/po/mi.po	2005-02-10 12:19:01.000000000 +0100
-+++ nautilus-2.14.3.new/po/mi.po	2006-11-30 13:44:08.000000000 +0100
+ 
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/mi.po
+===================================================================
+--- nautilus-2.16.3.orig/po/mi.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/mi.po	2006-12-13 22:40:15.000000000 +0100
 @@ -6015,3 +6015,16 @@
  #, fuzzy
  #~ msgid "New Server"
@@ -839,12 +880,13 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/mk.po nautilus-2.14.3.new/po/mk.po
---- nautilus-2.14.3/po/mk.po	2006-03-21 18:33:47.000000000 +0100
-+++ nautilus-2.14.3.new/po/mk.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5825,3 +5825,16 @@
- msgid "View your network servers in the Nautilus file manager"
- msgstr "Ð“Ð»ÐµÐ´Ð°Ñ˜ Ð³Ð¸ Ñ‚Ð²Ð¾Ð¸Ñ‚Ðµ Ð¼Ñ€ÐµÐ¶Ð½Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð¸ Ð²Ð¾ ÐÐ°ÑƒÑ‚Ð¸Ð»ÑƒÑ - Ð¼ÐµÐ½Ð°ÑŸÐµÑ€Ð¾Ñ‚ Ð·Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
+Index: nautilus-2.16.3/po/mk.po
+===================================================================
+--- nautilus-2.16.3.orig/po/mk.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/mk.po	2006-12-13 22:40:15.000000000 +0100
+@@ -6001,3 +6001,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Ð“Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ Ð³Ð¸ Ð’Ð°ÑˆÐ¸Ñ‚Ðµ Ð¼Ñ€ÐµÐ¶Ð½Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð¸ Ð²Ð¾ Nautilus - Ð¼ÐµÐ½Ð°ÑŸÐµÑ€Ð¾Ñ‚ Ð·Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
  
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
@@ -859,29 +901,31 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Ð’Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð½Ðµ Ð³Ð¾ Ð¾Ñ‚ÑÑ‚Ñ€Ð°Ð½ÑƒÐ²Ð°Ñ˜Ñ‚Ðµ ÑƒÑ€ÐµÐ´Ð¾Ñ‚ Ð´Ð¾Ð´ÐµÐºÐ° Ñ‚Ñ€Ð°Ðµ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð°."
-diff -Nur nautilus-2.14.3/po/ml.po nautilus-2.14.3.new/po/ml.po
---- nautilus-2.14.3/po/ml.po	2005-02-10 12:19:01.000000000 +0100
-+++ nautilus-2.14.3.new/po/ml.po	2006-11-30 13:44:08.000000000 +0100
-@@ -7522,3 +7522,16 @@
- 
- #~ msgid "Go to Nonexistent Location"
- #~ msgstr "à´¨à´¿à´²à´µà´¿à´²à´¿à´²àµà´²à´¾à´¤àµà´¤ à´¸àµà´¥à´¾à´¨à´¤àµà´¤àµ à´ªàµ‹à´•àµà´•"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/mn.po nautilus-2.14.3.new/po/mn.po
---- nautilus-2.14.3/po/mn.po	2005-02-10 12:19:01.000000000 +0100
-+++ nautilus-2.14.3.new/po/mn.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ml.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ml.po	2006-12-13 21:59:18.000000000 +0100
++++ nautilus-2.16.3/po/ml.po	2006-12-13 22:40:15.000000000 +0100
+@@ -5715,3 +5715,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "à´¨àµ‹à´Ÿàµà´Ÿà´¿à´²à´¸àµ à´«à´¯à´²àµâ€ à´®à´¾à´¨àµ‡à´œà´±à´¿à´²àµà´³à´³ à´¨àµ†à´±àµà´±àµâ€à´µà´°àµâ€à´•àµà´•àµ à´¸à´°àµâ€à´µà´±àµà´•à´³àµâ€ à´•à´¾à´£àµà´•"
+ 
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/mn.po
+===================================================================
+--- nautilus-2.16.3.orig/po/mn.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/mn.po	2006-12-13 22:40:15.000000000 +0100
 @@ -6882,3 +6882,16 @@
  
  #~ msgid "Example:"
@@ -899,9 +943,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/ms.po nautilus-2.14.3.new/po/ms.po
---- nautilus-2.14.3/po/ms.po	2005-02-10 12:19:01.000000000 +0100
-+++ nautilus-2.14.3.new/po/ms.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ms.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ms.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/ms.po	2006-12-13 22:40:15.000000000 +0100
 @@ -6504,3 +6504,16 @@
  
  #~ msgid "Try to fit in window"
@@ -919,13 +964,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/nb.po nautilus-2.14.3.new/po/nb.po
---- nautilus-2.14.3/po/nb.po	2006-04-02 14:32:50.000000000 +0200
-+++ nautilus-2.14.3.new/po/nb.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6006,3 +6006,16 @@
- 
- #~ msgid "View Failed"
- #~ msgstr "Visning feilet"
+Index: nautilus-2.16.3/po/nb.po
+===================================================================
+--- nautilus-2.16.3.orig/po/nb.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/nb.po	2006-12-13 22:40:15.000000000 +0100
+@@ -5933,3 +5933,16 @@
+ #: ../src/network-scheme.desktop.in.h:2
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Vis dine nettverkstjenere i filhÃ¥ndtereren Nautilus"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -939,9 +985,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Vennligst ikke fjern enheten mens denne operasjonen pÃ¥gÃ¥r."
-diff -Nur nautilus-2.14.3/po/ne.po nautilus-2.14.3.new/po/ne.po
---- nautilus-2.14.3/po/ne.po	2005-07-31 03:58:18.000000000 +0200
-+++ nautilus-2.14.3.new/po/ne.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ne.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ne.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/ne.po	2006-12-13 22:40:15.000000000 +0100
 @@ -5934,3 +5934,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "à¤¸à¤‚à¤œà¤¾à¤² à¤¸à¥‡à¤µà¤¾à¤¦à¤¾à¤¯à¤•à¤²à¤¾à¤ˆ à¤¨à¤Ÿà¤¿à¤²à¤¸ à¤«à¤¾à¤‡à¤² à¤ªà¥à¤°à¤¬à¤¨à¥à¤§à¤•à¤®à¤¾ à¤¹à¥‡à¤°à¥à¤¨à¥à¤¸à¥"
@@ -959,13 +1006,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/nl.po nautilus-2.14.3.new/po/nl.po
---- nautilus-2.14.3/po/nl.po	2006-07-31 22:32:11.000000000 +0200
-+++ nautilus-2.14.3.new/po/nl.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5865,3 +5865,16 @@
+Index: nautilus-2.16.3/po/nl.po
+===================================================================
+--- nautilus-2.16.3.orig/po/nl.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/nl.po	2006-12-13 22:40:15.000000000 +0100
+@@ -6087,3 +6087,16 @@
+ #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Uw netwerkservers weergeven met Nautilus bestandsbeheer"
- 
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -979,9 +1027,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Verwijder het apparaat niet zolang dit bezig is!"
-diff -Nur nautilus-2.14.3/po/nn.po nautilus-2.14.3.new/po/nn.po
---- nautilus-2.14.3/po/nn.po	2006-04-16 20:54:40.000000000 +0200
-+++ nautilus-2.14.3.new/po/nn.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/nn.po
+===================================================================
+--- nautilus-2.16.3.orig/po/nn.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/nn.po	2006-12-13 22:40:15.000000000 +0100
 @@ -5935,3 +5935,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
@@ -999,9 +1048,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/nso.po nautilus-2.14.3.new/po/nso.po
---- nautilus-2.14.3/po/nso.po	2005-02-10 12:19:02.000000000 +0100
-+++ nautilus-2.14.3.new/po/nso.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/nso.po
+===================================================================
+--- nautilus-2.16.3.orig/po/nso.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/nso.po	2006-12-13 22:40:16.000000000 +0100
 @@ -6785,3 +6785,16 @@
  
  #~ msgid "Try to fit in window"
@@ -1019,33 +1069,35 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/pa.po nautilus-2.14.3.new/po/pa.po
---- nautilus-2.14.3/po/pa.po	2006-05-20 10:06:24.000000000 +0200
-+++ nautilus-2.14.3.new/po/pa.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5668,3 +5668,16 @@
- msgid "View your network servers in the Nautilus file manager"
- msgstr "à¨¨à¨Ÿà©€à¨²à¨¸ à¨«à¨¾à¨‡à¨² à¨ªà¨°à¨¬à©°à¨§à¨• à¨µà¨¿à©±à¨š à¨†à¨ªà¨£à¨¾ à¨¨à©ˆà©±à¨Ÿà¨µà¨°à¨• à¨¸à¨°à¨µà¨° à¨µà©‡à¨–à©‹"
- 
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/pl.po nautilus-2.14.3.new/po/pl.po
---- nautilus-2.14.3/po/pl.po	2006-04-10 11:08:07.000000000 +0200
-+++ nautilus-2.14.3.new/po/pl.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5841,3 +5841,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
- msgstr "WyÅ›wietla serwery sieciowe przy uÅ¼yciu menedÅ¼era plikÃ³w - Nautilusa"
+Index: nautilus-2.16.3/po/pa.po
+===================================================================
+--- nautilus-2.16.3.orig/po/pa.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/pa.po	2006-12-13 22:40:16.000000000 +0100
+@@ -5838,3 +5838,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "à¨¨à¨Ÿà©€à¨²à¨¸ à¨«à¨¾à¨‡à¨² à¨®à©ˆà¨¨à©‡à¨œà¨° à¨µà¨¿à©±à¨š à¨†à¨ªà¨£à¨¾ à¨¨à©ˆà©±à¨Ÿà¨µà¨°à¨• à¨¸à¨°à¨µà¨° à¨µà©‡à¨–à©‹"
+ 
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/pl.po
+===================================================================
+--- nautilus-2.16.3.orig/po/pl.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/pl.po	2006-12-13 22:40:16.000000000 +0100
+@@ -5553,3 +5553,16 @@
+ #~ msgid "Always use _text-entry location bar"
+ #~ msgstr "UÅ¼ywanie _tekstowego paska poÅ‚oÅ¼enia"
+ 
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -1059,10 +1111,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ProszÄ™ nie odÅ‚Ä
czaÄ‡ urzÄ
dzenia podczas wykonywania tej operacji."
-diff -Nur nautilus-2.14.3/po/pt_BR.po nautilus-2.14.3.new/po/pt_BR.po
---- nautilus-2.14.3/po/pt_BR.po	2006-03-18 15:47:37.000000000 +0100
-+++ nautilus-2.14.3.new/po/pt_BR.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6948,3 +6948,16 @@
+Index: nautilus-2.16.3/po/pt_BR.po
+===================================================================
+--- nautilus-2.16.3.orig/po/pt_BR.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/pt_BR.po	2006-12-13 22:40:17.000000000 +0100
+@@ -7160,3 +7160,16 @@
  
  #~ msgid "Try to fit in window"
  #~ msgstr "Ajustar para caber na janela"
@@ -1079,10 +1132,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "NÃ£o remova o dispositivo enquanto esta operaÃ§Ã£o nÃ£o for completada."
-diff -Nur nautilus-2.14.3/po/pt.po nautilus-2.14.3.new/po/pt.po
---- nautilus-2.14.3/po/pt.po	2006-03-04 05:05:17.000000000 +0100
-+++ nautilus-2.14.3.new/po/pt.po	2006-11-30 13:44:08.000000000 +0100
-@@ -7881,3 +7881,16 @@
+Index: nautilus-2.16.3/po/pt.po
+===================================================================
+--- nautilus-2.16.3.orig/po/pt.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/pt.po	2006-12-13 22:40:17.000000000 +0100
+@@ -8102,3 +8102,16 @@
  
  #~ msgid "Reveal in %d _New Windows"
  #~ msgstr "Revelar em %d _Novas Janelas"
@@ -1099,10 +1153,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Por favor nÃ£o remova o dispositivo enquanto esta operaÃ§Ã£o decorre."
-diff -Nur nautilus-2.14.3/po/ru.po nautilus-2.14.3.new/po/ru.po
---- nautilus-2.14.3/po/ru.po	2006-02-24 12:10:30.000000000 +0100
-+++ nautilus-2.14.3.new/po/ru.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5823,3 +5823,16 @@
+Index: nautilus-2.16.3/po/ru.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ru.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/ru.po	2006-12-13 22:40:17.000000000 +0100
+@@ -6002,3 +6002,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ ÑÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑÐµÑ€Ð²ÐµÑ€Ñ‹ Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ðµ"
  
@@ -1119,9 +1174,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð½Ðµ ÑƒÐ´Ð°Ð»ÑÐ¹Ñ‚Ðµ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾ Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸."
-diff -Nur nautilus-2.14.3/po/rw.po nautilus-2.14.3.new/po/rw.po
---- nautilus-2.14.3/po/rw.po	2005-04-01 03:39:39.000000000 +0200
-+++ nautilus-2.14.3.new/po/rw.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/rw.po
+===================================================================
+--- nautilus-2.16.3.orig/po/rw.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/rw.po	2006-12-13 22:40:17.000000000 +0100
 @@ -6914,3 +6914,16 @@
  
  
@@ -1139,9 +1195,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/sk.po nautilus-2.14.3.new/po/sk.po
---- nautilus-2.14.3/po/sk.po	2005-12-28 23:34:48.000000000 +0100
-+++ nautilus-2.14.3.new/po/sk.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/sk.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sk.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/sk.po	2006-12-13 22:40:17.000000000 +0100
 @@ -5749,3 +5749,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
@@ -1159,13 +1216,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ProsÃm neodoberajte zariadenie pokÃ½m pracuje"
-diff -Nur nautilus-2.14.3/po/sl.po nautilus-2.14.3.new/po/sl.po
---- nautilus-2.14.3/po/sl.po	2005-02-10 12:19:06.000000000 +0100
-+++ nautilus-2.14.3.new/po/sl.po	2006-11-30 13:44:08.000000000 +0100
-@@ -12345,3 +12345,16 @@
- 
+Index: nautilus-2.16.3/po/sl.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sl.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/sl.po	2006-12-13 22:40:17.000000000 +0100
+@@ -10271,3 +10271,16 @@
  #~ msgid "Items %s %s"
  #~ msgstr "Predmeti %s %s"
+ 
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -1179,10 +1237,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Prosimo, da ne odstranjujete naprave med to operacijo."
-diff -Nur nautilus-2.14.3/po/sq.po nautilus-2.14.3.new/po/sq.po
---- nautilus-2.14.3/po/sq.po	2006-07-31 22:32:11.000000000 +0200
-+++ nautilus-2.14.3.new/po/sq.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5809,3 +5809,16 @@
+Index: nautilus-2.16.3/po/sq.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sq.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/sq.po	2006-12-13 22:40:17.000000000 +0100
+@@ -5803,3 +5803,16 @@
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Shiko rrjetin tuaj tÃ« server-ve tek organizuesi i file Nautilus"
  
@@ -1199,9 +1258,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/sr at ije.po nautilus-2.14.3.new/po/sr at ije.po
---- nautilus-2.14.3/po/sr at ije.po	2005-02-10 12:19:06.000000000 +0100
-+++ nautilus-2.14.3.new/po/sr at ije.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/sr at ije.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sr at ije.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/sr at ije.po	2006-12-13 22:40:17.000000000 +0100
 @@ -7457,3 +7457,16 @@
  
  #~ msgid "Find:"
@@ -1219,9 +1279,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/sr at Latn.po nautilus-2.14.3.new/po/sr at Latn.po
---- nautilus-2.14.3/po/sr at Latn.po	2006-01-31 03:05:39.000000000 +0100
-+++ nautilus-2.14.3.new/po/sr at Latn.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/sr at Latn.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sr at Latn.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/sr at Latn.po	2006-12-13 22:40:17.000000000 +0100
 @@ -8437,3 +8437,16 @@
  
  #~ msgid "Go to Nonexistent Location"
@@ -1239,9 +1300,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/sr.po nautilus-2.14.3.new/po/sr.po
---- nautilus-2.14.3/po/sr.po	2006-01-31 03:05:39.000000000 +0100
-+++ nautilus-2.14.3.new/po/sr.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/sr.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sr.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/sr.po	2006-12-13 22:40:17.000000000 +0100
 @@ -8437,3 +8437,16 @@
  
  #~ msgid "Go to Nonexistent Location"
@@ -1259,10 +1321,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/sv.po nautilus-2.14.3.new/po/sv.po
---- nautilus-2.14.3/po/sv.po	2006-05-21 00:52:19.000000000 +0200
-+++ nautilus-2.14.3.new/po/sv.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5406,3 +5406,16 @@
+Index: nautilus-2.16.3/po/sv.po
+===================================================================
+--- nautilus-2.16.3.orig/po/sv.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/sv.po	2006-12-13 22:40:17.000000000 +0100
+@@ -5584,3 +5584,16 @@
  #~ msgid "Personal"
  #~ msgstr "Personlig"
  
@@ -1279,29 +1342,31 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "Koppla inte ur enheten medan det hÃ¤r sker."
-diff -Nur nautilus-2.14.3/po/ta.po nautilus-2.14.3.new/po/ta.po
---- nautilus-2.14.3/po/ta.po	2005-02-10 12:19:06.000000000 +0100
-+++ nautilus-2.14.3.new/po/ta.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6529,3 +6529,16 @@
- 
- #~ msgid "Try to fit in window"
- #~ msgstr "à®šà®¾à®³à®°à®¤à¯à®¤à¯à®•à¯à®•à¯à®³à¯ à®ªà¯Šà®°à¯à®¤à¯à®¤ à®®à¯à®¯à®±à¯à®šà®¿ à®šà¯†à®¯à¯"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/te.po nautilus-2.14.3.new/po/te.po
---- nautilus-2.14.3/po/te.po	2005-08-08 18:28:21.000000000 +0200
-+++ nautilus-2.14.3.new/po/te.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/ta.po
+===================================================================
+--- nautilus-2.16.3.orig/po/ta.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/ta.po	2006-12-13 22:40:17.000000000 +0100
+@@ -5897,3 +5897,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "à®¨à®¾à®Ÿà¯à®²à®¸à¯ à®•à¯‹à®ªà¯à®ªà¯ à®®à¯‡à®²à®¾à®³à®°à®¿à®²à¯ à®µà®²à¯ˆà®ªà¯à®ªà®¿à®©à¯à®©à®²à¯ à®šà¯‡à®µà®•à®©à¯ˆ à®•à®¾à®Ÿà¯à®Ÿà¯"
+ 
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/te.po
+===================================================================
+--- nautilus-2.16.3.orig/po/te.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/te.po	2006-12-13 22:40:17.000000000 +0100
 @@ -6305,3 +6305,16 @@
  #~ msgstr ""
  #~ "If set to true, then Nautilus will bring up a new Nautilus window by "
@@ -1319,10 +1384,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/th.po nautilus-2.14.3.new/po/th.po
---- nautilus-2.14.3/po/th.po	2006-07-31 22:32:12.000000000 +0200
-+++ nautilus-2.14.3.new/po/th.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6426,3 +6426,16 @@
+Index: nautilus-2.16.3/po/th.po
+===================================================================
+--- nautilus-2.16.3.orig/po/th.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/th.po	2006-12-13 22:40:18.000000000 +0100
+@@ -6603,3 +6603,16 @@
  
  #~ msgid "Nautilus file manager search results list view"
  #~ msgstr "à¸¡à¸¸à¸¡à¸¡à¸à¸‡à¹à¸šà¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸‚à¸à¸‡à¸œà¸¥à¸à¸²à¸£à¸„à¹‰à¸™à¸«à¸²à¸•à¸±à¸§à¸ˆà¸±à¸”à¸à¸²à¸£à¹à¸Ÿà¹‰à¸¡à¸‚à¸à¸‡ Nautilus"
@@ -1339,9 +1405,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/tk.po nautilus-2.14.3.new/po/tk.po
---- nautilus-2.14.3/po/tk.po	2005-02-10 12:19:07.000000000 +0100
-+++ nautilus-2.14.3.new/po/tk.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/tk.po
+===================================================================
+--- nautilus-2.16.3.orig/po/tk.po	2006-12-13 21:59:19.000000000 +0100
++++ nautilus-2.16.3/po/tk.po	2006-12-13 22:40:18.000000000 +0100
 @@ -6621,3 +6621,16 @@
  
  #~ msgid "Error while moving. "
@@ -1359,13 +1426,14 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/tr.po nautilus-2.14.3.new/po/tr.po
---- nautilus-2.14.3/po/tr.po	2005-09-01 18:33:32.000000000 +0200
-+++ nautilus-2.14.3.new/po/tr.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6922,3 +6922,16 @@
- 
- #~ msgid "The attribute name to display"
- #~ msgstr "GÃ¶sterilecek Ã¶znitelik ismi"
+Index: nautilus-2.16.3/po/tr.po
+===================================================================
+--- nautilus-2.16.3.orig/po/tr.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/tr.po	2006-12-13 22:40:18.000000000 +0100
+@@ -6844,3 +6844,16 @@
+ #: ../src/network-scheme.desktop.in.h:2
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "Nautilus dosya yÃ¶neticisinde aÄŸ sunucularÄ±nÄ± gÃ¶rÃ¼ntÃ¼le"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
 +msgid "Removing device"
@@ -1379,10 +1447,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "LÃ¼tfen bu sÃ¼reÃ§ devam ederken aygÄ±tÄ± Ã§Ä±karmayÄ±n."
-diff -Nur nautilus-2.14.3/po/uk.po nautilus-2.14.3.new/po/uk.po
---- nautilus-2.14.3/po/uk.po	2006-03-03 12:49:08.000000000 +0100
-+++ nautilus-2.14.3.new/po/uk.po	2006-11-30 13:44:08.000000000 +0100
-@@ -6128,3 +6128,16 @@
+Index: nautilus-2.16.3/po/uk.po
+===================================================================
+--- nautilus-2.16.3.orig/po/uk.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/uk.po	2006-12-13 22:40:18.000000000 +0100
+@@ -6347,3 +6347,16 @@
  
  #~ msgid "View Failed"
  #~ msgstr "Ð—Ð±Ñ–Ð¹ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ"
@@ -1399,10 +1468,11 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr "ÐÐµ Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡Ð°Ð¹Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ñ–Ð¹ Ð¿Ñ–Ñ‡Ð°Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ—"
-diff -Nur nautilus-2.14.3/po/vi.po nautilus-2.14.3.new/po/vi.po
---- nautilus-2.14.3/po/vi.po	2006-07-31 22:32:12.000000000 +0200
-+++ nautilus-2.14.3.new/po/vi.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5676,3 +5676,16 @@
+Index: nautilus-2.16.3/po/vi.po
+===================================================================
+--- nautilus-2.16.3.orig/po/vi.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/vi.po	2006-12-13 22:40:18.000000000 +0100
+@@ -5936,3 +5936,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
  msgstr "Xem cÃ¡c mÃ¡y phá»¥c vá»¥ máº¡ng trong trÃ¬nh quáº£n lÃ½ táºp tin cá»§a Nautilus"
@@ -1419,9 +1489,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/wa.po nautilus-2.14.3.new/po/wa.po
---- nautilus-2.14.3/po/wa.po	2005-02-10 12:19:10.000000000 +0100
-+++ nautilus-2.14.3.new/po/wa.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/wa.po
+===================================================================
+--- nautilus-2.16.3.orig/po/wa.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/wa.po	2006-12-13 22:40:18.000000000 +0100
 @@ -7018,3 +7018,16 @@
  
  #~ msgid "_Toolbar"
@@ -1439,9 +1510,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/xh.po nautilus-2.14.3.new/po/xh.po
---- nautilus-2.14.3/po/xh.po	2005-03-29 15:11:57.000000000 +0200
-+++ nautilus-2.14.3.new/po/xh.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/xh.po
+===================================================================
+--- nautilus-2.16.3.orig/po/xh.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/xh.po	2006-12-13 22:40:18.000000000 +0100
 @@ -6513,3 +6513,16 @@
  #~ "Amalungelo omqulunqi Â© 2002-2004 Novell, Inc\n"
  #~ "Amalungelo omqulunqi Â© 1999-2001 Eazel, Inc.\n"
@@ -1459,9 +1531,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/yi.po nautilus-2.14.3.new/po/yi.po
---- nautilus-2.14.3/po/yi.po	2005-02-10 12:19:10.000000000 +0100
-+++ nautilus-2.14.3.new/po/yi.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/yi.po
+===================================================================
+--- nautilus-2.16.3.orig/po/yi.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/yi.po	2006-12-13 22:40:18.000000000 +0100
 @@ -5855,3 +5855,16 @@
  #, fuzzy
  #~ msgid "Example:"
@@ -1479,52 +1552,55 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/zh_CN.po nautilus-2.14.3.new/po/zh_CN.po
---- nautilus-2.14.3/po/zh_CN.po	2006-05-19 15:28:36.000000000 +0200
-+++ nautilus-2.14.3.new/po/zh_CN.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5609,3 +5609,16 @@
+Index: nautilus-2.16.3/po/zh_CN.po
+===================================================================
+--- nautilus-2.16.3.orig/po/zh_CN.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/zh_CN.po	2006-12-13 22:40:18.000000000 +0100
+@@ -5780,3 +5780,16 @@
+ msgid "View your network servers in the Nautilus file manager"
+ msgstr "åœ¨ Nautilus æ–‡ä»¶ç®¡ç†å™¨ä¸æŸ¥çœ‹æ‚¨çš„ç½‘ç»œæœåŠ¡å™¨"
+ 
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/zh_HK.po
+===================================================================
+--- nautilus-2.16.3.orig/po/zh_HK.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/zh_HK.po	2006-12-13 22:40:18.000000000 +0100
+@@ -5735,3 +5735,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
- msgstr "åœ¨ Nautilus æ–‡ä»¶ç®¡ç†å™¨ä¸æŸ¥çœ‹æ‚¨çš„ç½‘ç»œæœåŠ¡å™¨"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/zh_HK.po nautilus-2.14.3.new/po/zh_HK.po
---- nautilus-2.14.3/po/zh_HK.po	2006-04-23 10:27:00.000000000 +0200
-+++ nautilus-2.14.3.new/po/zh_HK.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5659,3 +5659,16 @@
+ msgstr "åœ¨ Nautilus æª”æ¡ˆç¸½ç®¡ä¸ç€è¦½ç¶²çµ¡ä¼ºæœå™¨"
++
++#: ../src/file-manager/fm-directory-view.c:6301
++msgid "Removing device"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6308
++#, c-format
++msgid "<b>Writing data to storage device %s</b>"
++msgstr ""
++
++#: ../src/file-manager/fm-directory-view.c:6321
++msgid "Please do not remove the device while this operation is in progress."
++msgstr ""
+Index: nautilus-2.16.3/po/zh_TW.po
+===================================================================
+--- nautilus-2.16.3.orig/po/zh_TW.po	2006-12-13 21:59:16.000000000 +0100
++++ nautilus-2.16.3/po/zh_TW.po	2006-12-13 22:40:18.000000000 +0100
+@@ -5735,3 +5735,16 @@
  #: ../src/network-scheme.desktop.in.h:2
  msgid "View your network servers in the Nautilus file manager"
- msgstr "åœ¨ Nautilus æª”æ¡ˆç¸½ç®¡ä¸ç€è¦½ç¶²çµ¡ä¼ºæœå™¨"
-+
-+#: ../src/file-manager/fm-directory-view.c:6301
-+msgid "Removing device"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6308
-+#, c-format
-+msgid "<b>Writing data to storage device %s</b>"
-+msgstr ""
-+
-+#: ../src/file-manager/fm-directory-view.c:6321
-+msgid "Please do not remove the device while this operation is in progress."
-+msgstr ""
-diff -Nur nautilus-2.14.3/po/zh_TW.po nautilus-2.14.3.new/po/zh_TW.po
---- nautilus-2.14.3/po/zh_TW.po	2006-04-23 10:27:00.000000000 +0200
-+++ nautilus-2.14.3.new/po/zh_TW.po	2006-11-30 13:44:08.000000000 +0100
-@@ -5659,3 +5659,16 @@
- #: ../src/network-scheme.desktop.in.h:2
- msgid "View your network servers in the Nautilus file manager"
  msgstr "åœ¨ Nautilus æª”æ¡ˆç¸½ç®¡ä¸ç€è¦½ç¶²è·¯ä¼ºæœå™¨"
 +
 +#: ../src/file-manager/fm-directory-view.c:6301
@@ -1539,9 +1615,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/po/zu.po nautilus-2.14.3.new/po/zu.po
---- nautilus-2.14.3/po/zu.po	2005-02-10 12:19:10.000000000 +0100
-+++ nautilus-2.14.3.new/po/zu.po	2006-11-30 13:44:08.000000000 +0100
+Index: nautilus-2.16.3/po/zu.po
+===================================================================
+--- nautilus-2.16.3.orig/po/zu.po	2006-12-13 21:59:20.000000000 +0100
++++ nautilus-2.16.3/po/zu.po	2006-12-13 22:40:18.000000000 +0100
 @@ -6636,3 +6636,16 @@
  
  #~ msgid "Try to fit in window"
@@ -1559,9 +1636,10 @@
 +#: ../src/file-manager/fm-directory-view.c:6321
 +msgid "Please do not remove the device while this operation is in progress."
 +msgstr ""
-diff -Nur nautilus-2.14.3/src/file-manager/fm-directory-view.c nautilus-2.14.3.new/src/file-manager/fm-directory-view.c
---- nautilus-2.14.3/src/file-manager/fm-directory-view.c	2006-04-08 00:47:23.000000000 +0200
-+++ nautilus-2.14.3.new/src/file-manager/fm-directory-view.c	2006-11-30 13:44:40.000000000 +0100
+Index: nautilus-2.16.3/src/file-manager/fm-directory-view.c
+===================================================================
+--- nautilus-2.16.3.orig/src/file-manager/fm-directory-view.c	2006-12-13 22:40:07.000000000 +0100
++++ nautilus-2.16.3/src/file-manager/fm-directory-view.c	2006-12-13 22:40:18.000000000 +0100
 @@ -61,10 +61,12 @@
  #include <gtk/gtkmessagedialog.h>
  #include <gtk/gtkfilechooserbutton.h>
@@ -1575,7 +1653,7 @@
  #include <glib/gi18n.h>
  #include <libgnome/gnome-util.h>
  #include <libgnomeui/gnome-uidefs.h>
-@@ -6242,6 +6244,10 @@
+@@ -6280,6 +6282,10 @@
  				    char *detailed_error,
  				    gpointer data)
  {
@@ -1586,7 +1664,7 @@
  	if (!succeeded) {
  		if (*error == 0 &&
  		    detailed_error != NULL && *detailed_error == 0) {
-@@ -6260,6 +6266,10 @@
+@@ -6298,6 +6304,10 @@
  				    char *detailed_error,
  				    gpointer data)
  {
@@ -1597,7 +1675,7 @@
  	if (!succeeded) {
  		if (*error == 0 &&
  		    detailed_error != NULL && *detailed_error == 0) {
-@@ -6271,6 +6281,52 @@
+@@ -6309,6 +6319,52 @@
  	}
  }
  
@@ -1650,7 +1728,7 @@
  
  static void
  action_unmount_volume_callback (GtkAction *action,
-@@ -6281,9 +6337,10 @@
+@@ -6319,9 +6375,10 @@
  	GnomeVFSDrive *drive;
  	GnomeVFSVolume *volume;
  	FMDirectoryView *view;
@@ -1662,7 +1740,7 @@
  	selection = fm_directory_view_get_selection (view);
  
  	for (l = selection; l != NULL; l = l->next) {
-@@ -6291,12 +6348,20 @@
+@@ -6329,12 +6386,20 @@
  		if (nautilus_file_has_volume (file)) {
  			volume = nautilus_file_get_volume (file);
  			if (volume != NULL) {
@@ -1685,7 +1763,7 @@
  			}
  		}
  	}
-@@ -6337,6 +6402,7 @@
+@@ -6375,6 +6440,7 @@
  	GnomeVFSDrive *drive;
  	GnomeVFSVolume *volume;
  	FMDirectoryView *view;
@@ -1693,7 +1771,7 @@
  
          view = FM_DIRECTORY_VIEW (data);
  	
-@@ -6347,12 +6413,20 @@
+@@ -6385,12 +6451,20 @@
  		if (nautilus_file_has_volume (file)) {
  			volume = nautilus_file_get_volume (file);
  			if (volume != NULL) {

Added: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=10333&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (added)
+++ desktop/unstable/nautilus/debian/patches/series Tue Apr 24 20:38:00 2007
@@ -1,0 +1,11 @@
+01_prompt_same_file.patch
+02_umask.patch
+03_sftp_connect.patch
+04_show_backup_files.patch
+05_places-sidebar_single-click.patch
+06_dont_create_Desktop.patch -p0
+07_desktop_file_activation.patch
+08_folder_handler.patch
+09_connect_server_iter.patch
+10_location_titlebar.patch
+11_umount-progress-bar.patch

Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules (original)
+++ desktop/unstable/nautilus/debian/rules Tue Apr 24 20:38:00 2007
@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # debug lib
@@ -12,4 +15,4 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.14.0)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.15.90)'

Modified: desktop/unstable/nautilus/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/watch?rev=10333&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/watch (original)
+++ desktop/unstable/nautilus/debian/watch Tue Apr 24 20:38:00 2007
@@ -1,4 +1,2 @@
 version=2
-ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/2.14/ \
-        nautilus-(.*)\.tar\.gz \
-        debian uupdate
+http://ftp.gnome.org/pub/gnome/sources/bug-buddy/([\d\.]+)[02468]/bug-buddy-([\d\.]+)\.tar\.gz


