Commit 506f9f2a authored by John Sullivan's avatar John Sullivan

Fixed bug 6785 ("Trash" should be capitalized)

	I grepped Nautilus sources for "the trash" and replaced
	it with "the Trash". Let me know if you can think of
	any references to the Trash that don't start with "the".

	* libnautilus-extensions/nautilus-file-operations.c:
	(build_error_string), (confirm_empty_trash):
	* src/file-manager/fm-directory-view.c:
	(fm_directory_view_confirm_deletion), (confirm_delete_from_trash),
	(report_broken_symbolic_link):
	* src/file-manager/nautilus-desktop-icon-view-ui.xml:
	* src/file-manager/nautilus-directory-view-ui.xml:
parent df7574e9
2001-02-20 John Sullivan <sullivan@eazel.com>
Fixed bug 6785 ("Trash" should be capitalized)
I grepped Nautilus sources for "the trash" and replaced
it with "the Trash". Let me know if you can think of
any references to the Trash that don't start with "the".
* libnautilus-extensions/nautilus-file-operations.c:
(build_error_string), (confirm_empty_trash):
* src/file-manager/fm-directory-view.c:
(fm_directory_view_confirm_deletion), (confirm_delete_from_trash),
(report_broken_symbolic_link):
* src/file-manager/nautilus-desktop-icon-view-ui.xml:
* src/file-manager/nautilus-directory-view-ui.xml:
2001-02-20 Dan Mueth <dan@eazel.com>
* user-guide/C/Makefile.am: Changed so only a warning is
......
......@@ -641,7 +641,7 @@ build_error_string (const char *source_name, const char *target_name,
case TRANSFER_MOVE_TO_TRASH:
if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
error_string = _("Error while moving.\n\n"
"\"%s\" cannot be moved to the trash because you do not have "
"\"%s\" cannot be moved to the Trash because you do not have "
"permissions to change it or its parent folder.");
}
break;
......@@ -2309,7 +2309,7 @@ confirm_empty_trash (GtkWidget *parent_view)
dialog = nautilus_show_yes_no_dialog (
_("Are you sure you want to permanently delete "
"all of the items in the trash?"),
"all of the items in the Trash?"),
_("Delete Trash Contents?"),
_("Empty"),
GNOME_STOCK_BUTTON_CANCEL,
......
......@@ -641,7 +641,7 @@ build_error_string (const char *source_name, const char *target_name,
case TRANSFER_MOVE_TO_TRASH:
if (error_kind == ERROR_NOT_ENOUGH_PERMISSIONS) {
error_string = _("Error while moving.\n\n"
"\"%s\" cannot be moved to the trash because you do not have "
"\"%s\" cannot be moved to the Trash because you do not have "
"permissions to change it or its parent folder.");
}
break;
......@@ -2309,7 +2309,7 @@ confirm_empty_trash (GtkWidget *parent_view)
dialog = nautilus_show_yes_no_dialog (
_("Are you sure you want to permanently delete "
"all of the items in the trash?"),
"all of the items in the Trash?"),
_("Delete Trash Contents?"),
_("Empty"),
GNOME_STOCK_BUTTON_CANCEL,
......
......@@ -2598,17 +2598,17 @@ fm_directory_view_confirm_deletion (FMDirectoryView *view, GList *uris, gboolean
if (uri_count == 1) {
file_name = file_name_from_uri ((char *)uris->data);
prompt = g_strdup_printf (_("\"%s\" cannot be moved to the trash. Do "
prompt = g_strdup_printf (_("\"%s\" cannot be moved to the Trash. Do "
"you want to delete it immediately?"), file_name);
g_free (file_name);
} else {
if (all) {
prompt = g_strdup_printf (_("The %d selected items cannot be moved "
"to the trash. Do you want to delete them "
"to the Trash. Do you want to delete them "
"immediately?"), uri_count);
} else {
prompt = g_strdup_printf (_("%d of the selected items cannot be moved "
"to the trash. Do you want to delete those "
"to the Trash. Do you want to delete those "
"%d items immediately?"), uri_count, uri_count);
}
}
......@@ -2647,11 +2647,11 @@ confirm_delete_from_trash (FMDirectoryView *view, GList *uris)
file_name = file_name_from_uri ((char *)uris->data);
prompt = g_strdup_printf (_("Are you sure you want to permanently delete \"%s\" "
"from the trash?"), file_name);
"from the Trash?"), file_name);
g_free (file_name);
} else {
prompt = g_strdup_printf (_("Are you sure you want to permanently delete "
"the %d selected items from the trash?"), uri_count);
"the %d selected items from the Trash?"), uri_count);
}
dialog = nautilus_show_yes_no_dialog (
......@@ -3430,10 +3430,10 @@ report_broken_symbolic_link (FMDirectoryView *view, NautilusFile *file)
target_path = nautilus_file_get_symbolic_link_target_path (file);
if (target_path == NULL) {
prompt = g_strdup_printf (_("This link can't be used, because it has no target. "
"Do you want to put this link in the trash?"));
"Do you want to put this link in the Trash?"));
} else {
prompt = g_strdup_printf (_("This link can't be used, because its target \"%s\" doesn't exist. "
"Do you want to put this link in the trash?"),
"Do you want to put this link in the Trash?"),
target_path);
}
......
......@@ -7,7 +7,7 @@
<cmd name="Add Bookmark" sensitive="0"/>
<cmd name="Empty Trash Conditional"
_label="Empty Trash"
_tip="Delete all items in the trash"/>
_tip="Delete all items in the Trash"/>
<cmd name="New Terminal"
_label="New Terminal"
_tip="Open a new GNOME terminal window"/>
......
......@@ -8,7 +8,7 @@
_tip="Duplicate each selected item"/>
<cmd name="Empty Trash"
_label="Empty Trash"
_tip="Delete all items in the trash"/>
_tip="Delete all items in the Trash"/>
<cmd name="New Folder"
_label="New Folder"
_tip="Create a new empty folder inside this folder"/>
......@@ -38,10 +38,10 @@
_tip="View or modify the properties of each selected item"/>
<cmd name="Show Trash"
_label="Show Trash"
_tip="Show the contents of the trash"/>
_tip="Show the contents of the Trash"/>
<cmd name="Trash"
_label="Move to Trash"
_tip="Move each selected item to the trash"/>
_tip="Move each selected item to the Trash"/>
</commands>
<menu>
<submenu name="File">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment