nautilus r14007 - in trunk: . src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Sun Mar 30 20:40:01 2008
New Revision: 14007
URL: http://svn.gnome.org/viewvc/nautilus?rev=14007&view=rev

Log:
2008-03-30  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-desktop-icon-view.c
	(fm_desktop_icon_view_register):
	Do not translate unused desktop icon view labels.

	* src/file-manager/fm-icon-view.c:
	* src/file-manager/fm-list-view.c:
	Use "... View" instead of "View as ..." for view menu and dropdown.
	This makes the labels consistent with the preference dialog and with
	the compact view.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-desktop-icon-view.c
   trunk/src/file-manager/fm-icon-view.c
   trunk/src/file-manager/fm-list-view.c

Modified: trunk/src/file-manager/fm-desktop-icon-view.c
==============================================================================
--- trunk/src/file-manager/fm-desktop-icon-view.c	(original)
+++ trunk/src/file-manager/fm-desktop-icon-view.c	Sun Mar 30 20:40:01 2008
@@ -796,11 +796,11 @@
 static NautilusViewInfo fm_desktop_icon_view = {
 	FM_DESKTOP_ICON_VIEW_ID,
 	N_("Desktop"),
-	N_("View as Desktop"),
-	N_("View as _Desktop"),
+	"Desktop View",
+	"_Desktop View",
 	N_("The desktop view encountered an error."),
 	N_("The desktop view encountered an error while starting up."),
-	N_("Display this location with the desktop view."),
+	"Display this location with the desktop view.",
 	fm_desktop_icon_view_create,
 	fm_desktop_icon_view_supports_uri
 };
@@ -809,11 +809,8 @@
 fm_desktop_icon_view_register (void)
 {
 	fm_desktop_icon_view.label = _(fm_desktop_icon_view.label);
-	fm_desktop_icon_view.view_as_label = _(fm_desktop_icon_view.view_as_label);
-	fm_desktop_icon_view.view_as_label_with_mnemonic = _(fm_desktop_icon_view.view_as_label_with_mnemonic);
 	fm_desktop_icon_view.error_label = _(fm_desktop_icon_view.error_label);
 	fm_desktop_icon_view.startup_error_label = _(fm_desktop_icon_view.startup_error_label);
-	fm_desktop_icon_view.display_location_label = _(fm_desktop_icon_view.display_location_label);
 	
 	nautilus_view_factory_register (&fm_desktop_icon_view);
 }

Modified: trunk/src/file-manager/fm-icon-view.c
==============================================================================
--- trunk/src/file-manager/fm-icon-view.c	(original)
+++ trunk/src/file-manager/fm-icon-view.c	Sun Mar 30 20:40:01 2008
@@ -2932,8 +2932,8 @@
 static NautilusViewInfo fm_icon_view = {
 	FM_ICON_VIEW_ID,
 	N_("Icons"),
-	N_("View as Icons"),
-	N_("View as _Icons"),
+	N_("Icon View"),
+	N_("_Icon View"),
 	N_("The icon view encountered an error."),
 	N_("The icon view encountered an error while starting up."),
 	N_("Display this location with the icon view."),

Modified: trunk/src/file-manager/fm-list-view.c
==============================================================================
--- trunk/src/file-manager/fm-list-view.c	(original)
+++ trunk/src/file-manager/fm-list-view.c	Sun Mar 30 20:40:01 2008
@@ -2835,8 +2835,8 @@
 static NautilusViewInfo fm_list_view = {
 	FM_LIST_VIEW_ID,
 	N_("List"),
-	N_("View as List"),
-	N_("View as _List"),
+	N_("List View"),
+	N_("_List View"),
 	N_("The list view encountered an error."),
 	N_("The list view encountered an error while starting up."),
 	N_("Display this location with the list view."),