[nautilus/gnome-2-32: 283/283] Release 2.31.6.

[Cosimo Cecchi <cosimoc src gnome org>]

commit 6b4de8a7b07c9f610ce9f2d7879ff121c07ff380
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Aug 12 13:00:06 2010 +0200

    Release 2.31.6.

 NEWS           |   29 +++++++++++++++++++++++++++++
 po/POTFILES.in |    1 +
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3e3f63a..d3e24b5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,32 @@
+Major changes in 2.31.6 are:
+* This release is based on 2.30.1
+* A long list of fixes have been backported from the master branch,
+  including:
+  * Expand and collapse folders with +/- in list view
+  * Rename .desktop files also change their name on disk
+  * Support overriding .gnome2 directory
+  * Save passwords for the session by default
+  * Remove deleted folders from the pathbar
+  * Replace libunique with GApplication
+  * Don't show 'File Browser' anymore in the window title
+  * Port to GDBus
+  * Change the default order for files in special directories
+  * Support relative paths in the location entry/dialog.
+  * Use folder icons as window icons in browser and spatial mode
+  * Add 'Trashed On' and 'Original Location' columns in the trash
+  * Implement transparent icons for cut files
+  * Change default thumbnail size
+  * Fix a number of bugs related to bookmarks
+  * New dialog to handle conflicts within file copy/move operations
+  * New button in the trashbar to restore selected items
+  * Use async I/O to save .gtk-bookmarks
+  * Fix a number of issues related to DnD in the places sidebar
+  * New icon for audio preview
+  * Don't show Unmount when showing Eject/Safe Removal
+  * Bump libnautilus-extension API version
+  * Fix a number of UI glitches
+* Translation updates
+
 Major changes in 2.30.1 are:
 * Translation updates
 * Support for tracker 0.8.0
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e27ca68..b0ec51e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ libnautilus-private/nautilus-desktop-link.c
 libnautilus-private/nautilus-dnd.c
 libnautilus-private/nautilus-emblem-utils.c
 libnautilus-private/nautilus-entry.c
+libnautilus-private/nautilus-file-conflict-dialog.c
 libnautilus-private/nautilus-file-operations.c
 libnautilus-private/nautilus-file-utilities.c
 libnautilus-private/nautilus-file.c