[nautilus] Release 2.31.1.

[Cosimo Cecchi <cosimoc src gnome org>]

commit e6a7039162d4eb37afe329cc4d8378f9edb446c7
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue May 4 01:31:53 2010 +0200

    Release 2.31.1.

 NEWS           |   13 +++++++++++++
 po/POTFILES.in |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3e3f63a..dc511a8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Major changes in 2.31.1 are:
+* New dialog to handle conflicts within file copy/move operations
+* New button in the trashbar to restore selected items
+* Use XDG_CONFIG dir to store configuration. The old configuration files
+  will be migrated there automatically.
+* 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