[f-spot: 3/4] Fix BGO#603053.

[Ruben Vermeersch <rubenv src gnome org>]

commit d9b33b9c790d6b904d6845b8e085aa7b09f5f164
Author: Ruben Vermeersch <ruben savanne be>
Date:   Mon Mar 1 18:03:08 2010 +0100

    Fix BGO#603053.
    
    Bug 603053 -  "Import tags" category sounds like an action
    Patch by Ian Churcher <iain linux coding googlemail com>

 src/ImportCommand.cs   |    5 ++---
 src/Updater.cs         |    6 ++++++
 src/XmpTagsImporter.cs |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index 47f84a6..a3910d1 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -735,10 +735,9 @@ public class ImportCommand : GladeDialog
 		foreach (string tagname in new_tags) {
 			Tag t = db.Tags.GetTagByName (tagname);
 			if (t == null) {
-				// Note for translators: 'Import Tags' is no command, it means 'Tags used in Import'
-				Category default_category = db.Tags.GetTagByName (Catalog.GetString ("Import Tags")) as Category;
+				Category default_category = db.Tags.GetTagByName (Catalog.GetString ("Imported Tags")) as Category;
 				if (default_category == null) {
-					default_category = db.Tags.CreateCategory (null, Catalog.GetString ("Import Tags"), false);
+					default_category = db.Tags.CreateCategory (null, Catalog.GetString ("Imported Tags"), false);
 					default_category.ThemeIconName = "gtk-new"; 
 				}
 				t = db.Tags.CreateCategory (default_category, tagname, false) as Tag;
diff --git a/src/Updater.cs b/src/Updater.cs
index 5e23e32..bc56161 100644
--- a/src/Updater.cs
+++ b/src/Updater.cs
@@ -582,6 +582,12 @@ namespace FSpot.Database {
 				
 
 			}, true);
+
+			// Update to version 17.1, Rename 'Import Tags' to 'Imported Tags'
+			AddUpdate (new Version (17,1),delegate () {	
+				Execute ("UPDATE tags SET name = 'Imported Tags' WHERE name = 'Import Tags'");
+			});
+			
 		}
 
 		public static void Run (Db database)
diff --git a/src/XmpTagsImporter.cs b/src/XmpTagsImporter.cs
index a458e59..6404179 100644
--- a/src/XmpTagsImporter.cs
+++ b/src/XmpTagsImporter.cs
@@ -86,7 +86,7 @@ namespace FSpot.Xmp {
 			this.tag_store = tag_store;
 			tags_created = new Stack<Tag> ();
 			
-			li_root_tag = new TagInfo (Catalog.GetString ("Import Tags"), LastImportIcon);
+			li_root_tag = new TagInfo (Catalog.GetString ("Imported Tags"), LastImportIcon);
 			taginfo_table [(Entity)Location] = new TagInfo (Catalog.GetString ("Location"), PlacesIcon);
 			taginfo_table [(Entity)Country] = new TagInfo (Catalog.GetString ("Country"), PlacesIcon);
 			taginfo_table [(Entity)City] = new TagInfo (Catalog.GetString ("City"), PlacesIcon);