Fix other breakage from IconView->CanvasView renames

- fix loading of the desktop icon view
- don't use the term "Canvas" in translatable strings, since that's just
  an internal implementation detail

This also fixes
https://bugzilla.gnome.org/show_bug.cgi?id=681388

8 files changed, 12 insertions, 12 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cc622fde8..8ea30b476 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -60,7 +60,7 @@ src/nautilus-file-management-properties.c
 [type: gettext/glade]src/nautilus-file-management-properties.ui
 src/nautilus-canvas-view.c
 src/nautilus-canvas-view-container.c
-src/nautilus-icon-view-ui.xml
+src/nautilus-canvas-view-ui.xml
 src/nautilus-image-properties-page.c
 src/nautilus-list-model.c
 src/nautilus-list-view.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 086d5bd26..7254b1940 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,7 @@ UI_FILES = \
 	nautilus-app-menu.ui			\
 	nautilus-bookmarks-window.ui		\
 	nautilus-file-management-properties.ui	\
-	nautilus-icon-view-ui.xml		\
+	nautilus-canvas-view-ui.xml		\
 	nautilus-directory-view-ui.xml		\
 	nautilus-desktop-icon-view-ui.xml	\
 	nautilus-list-view-ui.xml		\
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 6dfb0eb74..b5c231333 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -31,7 +31,7 @@
 #include "nautilus-bookmark-list.h"
 #include "nautilus-window.h"
 
-#define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
+#define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Canvas_View"
 
 #define NAUTILUS_TYPE_APPLICATION nautilus_application_get_type()
 #define NAUTILUS_APPLICATION(obj) \
diff --git a/src/nautilus-canvas-view-container.c b/src/nautilus-canvas-view-container.c
index 94dc7bedf..2d93584ed 100644
--- a/src/nautilus-canvas-view-container.c
+++ b/src/nautilus-canvas-view-container.c
@@ -565,7 +565,7 @@ nautilus_canvas_view_container_construct (NautilusCanvasViewContainer *canvas_co
 
 	canvas_container->view = view;
 	atk_obj = gtk_widget_get_accessible (GTK_WIDGET (canvas_container));
-	atk_object_set_name (atk_obj, _("Canvas View"));
+	atk_object_set_name (atk_obj, _("Icon View"));
 
 	return NAUTILUS_CANVAS_CONTAINER (canvas_container);
 }
diff --git a/src/nautilus-icon-view-ui.xml b/src/nautilus-canvas-view-ui.xml
index b8b2c51d6..750cbda85 100644
--- a/src/nautilus-icon-view-ui.xml
+++ b/src/nautilus-canvas-view-ui.xml
@@ -46,6 +46,6 @@
     </placeholder>
   </popup>
   <popup name="selection">
-    <placeholder name="Icon Appearance Items"/>
+    <placeholder name="Canvas Appearance Items"/>
   </popup>
 </ui>
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index e4ac264e7..6698ba1d6 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -1227,12 +1227,12 @@ nautilus_canvas_view_start_renaming_file (NautilusView *view,
 static const GtkActionEntry canvas_view_entries[] = {
   /* name, stock id, label */  { "Arrange Items", NULL, N_("Arran_ge Items") }, 
   /* name, stock id */         { "Stretch", NULL,
-  /* label, accelerator */       N_("Resize Canvas..."), NULL,
-  /* tooltip */                  N_("Make the selected canvas resizable"),
+  /* label, accelerator */       N_("Resize Icon..."), NULL,
+  /* tooltip */                  N_("Make the selected icons resizable"),
                                  G_CALLBACK (action_stretch_callback) },
   /* name, stock id */         { "Unstretch", NULL,
   /* label, accelerator */       N_("Restore Icons' Original Si_zes"), NULL,
-  /* tooltip */                  N_("Restore each selected canvas to its original size"),
+  /* tooltip */                  N_("Restore each selected icons to its original size"),
                                  G_CALLBACK (action_unstretch_callback) },
   /* name, stock id */         { "Clean Up", NULL,
   /* label, accelerator */       N_("_Organize by Name"), NULL,
@@ -1396,7 +1396,7 @@ nautilus_canvas_view_update_menus (NautilusView *view)
 	g_object_set (action, "label",
 		      (selection_count > 1)
 		      ? _("Restore Icons' Original Si_zes")
-		      : _("Restore Canvas's Original Si_ze"),
+		      : _("Restore Icon's Original Si_ze"),
 		      NULL);
 	gtk_action_set_sensitive (action,
 				  canvas_container != NULL
@@ -2461,7 +2461,7 @@ static NautilusViewInfo nautilus_canvas_view = {
 	N_("_Icons"),
 	N_("The icon view encountered an error."),
 	N_("The icon view encountered an error while starting up."),
-	N_("Display this location with the canvas view."),
+	N_("Display this location with the icon view."),
 	nautilus_canvas_view_create,
 	nautilus_canvas_view_supports_uri
 };
diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
index 5e8ed9380..f5e1da108 100644
--- a/src/nautilus-directory-view-ui.xml
+++ b/src/nautilus-directory-view-ui.xml
@@ -164,7 +164,7 @@
     <menuitem name="Restore From Trash" action="Restore From Trash"/>
   </placeholder>
   <separator name="Appearance separator"/>
-  <placeholder name="Icon Appearance Items">
+  <placeholder name="Canvas Appearance Items">
   </placeholder>
   <separator name="Extension actions separator"/>
   <placeholder name="Extension Actions"/>
diff --git a/src/nautilus.gresource.xml b/src/nautilus.gresource.xml
index 79ed90b59..996d5eb3f 100644
--- a/src/nautilus.gresource.xml
+++ b/src/nautilus.gresource.xml
@@ -3,7 +3,7 @@
   <gresource prefix="/org/gnome/nautilus">
     <file compressed="true">nautilus-bookmarks-window.ui</file>
     <file compressed="true">nautilus-file-management-properties.ui</file>
-    <file>nautilus-icon-view-ui.xml</file>
+    <file>nautilus-canvas-view-ui.xml</file>
     <file>nautilus-directory-view-ui.xml</file>
     <file>nautilus-desktop-icon-view-ui.xml</file>
     <file>nautilus-list-view-ui.xml</file>