[f-spot: 4/4] Merge branch 'FSPOT_0_6_0_STABLE'

[Ruben Vermeersch <rubenv src gnome org>]

commit 04528d944b6aa30967e94544d4732d5ef9483e18
Merge: df88992 d9b33b9
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Mar 1 18:05:57 2010 +0100

    Merge branch 'FSPOT_0_6_0_STABLE'
    
    Conflicts:
    	extensions/Tools/HashJob/HashJob.addin.xml

 extensions/Tools/HashJob/HashJob.addin.xml |    4 ++--
 src/ImportCommand.cs                       |    5 ++---
 src/TagPopup.cs                            |    2 +-
 src/Updater.cs                             |    6 ++++++
 src/XmpTagsImporter.cs                     |    2 +-
 src/ui/main_window.ui                      |    2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)
---
diff --cc extensions/Tools/HashJob/HashJob.addin.xml
index a31ff56,0393999..74558f0
--- a/extensions/Tools/HashJob/HashJob.addin.xml
+++ b/extensions/Tools/HashJob/HashJob.addin.xml
@@@ -4,12 -4,12 +4,12 @@@
  	description="Process your photo collection for duplicate detection"
  	author="Stephane Delcroix"
  	url="http://f-spot.org/Extensions";
- 	name="Hash for Duplicates"
+ 	name="Check for Duplicates"
  	category="Tools">
  	<Dependencies>
 -		<Addin id="Core" version="0.6"/>
 +		<Addin id="Core" version="0.7"/>
  	</Dependencies>
  	<Extension path = "/FSpot/Menus/Tools">
- 		<Command id = "HashDupes" _label = "Hash for Duplicates" command_type = "HashJobExtension.HashJob" />
+ 		<Command id = "HashDupes" _label = "Check for Duplicates..." command_type = "HashJobExtension.HashJob" />
  	</Extension>
  </Addin>