summaryrefslogtreecommitdiff
path: root/libnautilus-extensions/nautilus-file-operations.c
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@src.gnome.org>2000-09-15 15:41:46 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2000-09-15 15:41:46 +0000
commit9641d55db7c4facbde87cf974571533b248f7478 (patch)
tree3c403233a0dad0918e5c8170f3fd55a513f3cb83 /libnautilus-extensions/nautilus-file-operations.c
parentc270eb7275d301890441f1ce46db813a0a410603 (diff)
downloadnautilus-9641d55db7c4facbde87cf974571533b248f7478.tar.gz
Tweaked a bunch of error message and dialog title wording.
* libnautilus-extensions/nautilus-file-operations.c: (handle_xfer_vfs_error), (handle_xfer_overwrite), (nautilus_file_operations_copy_move), (nautilus_file_operations_move_to_trash): Tweaked a bunch of error message and dialog title wording.
Diffstat (limited to 'libnautilus-extensions/nautilus-file-operations.c')
-rw-r--r--libnautilus-extensions/nautilus-file-operations.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c
index 9c534fbfa..fc019d452 100644
--- a/libnautilus-extensions/nautilus-file-operations.c
+++ b/libnautilus-extensions/nautilus-file-operations.c
@@ -380,7 +380,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(xfer_info->parent_view, text,
- _("Nautilus: File copy error"),
+ _("Nautilus: Error while copying file"),
_("Skip"), _("Stop"), NULL);
g_free (text);
@@ -407,7 +407,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
result = nautilus_simple_dialog
(xfer_info->parent_view, text,
- _("Nautilus: File copy error"),
+ _("Nautilus: Error while copying file"),
_("Skip"), _("Retry"), _("Stop"), NULL);
g_free (text);
@@ -458,7 +458,7 @@ handle_xfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
*/
result = nautilus_simple_dialog
(xfer_info->parent_view, text,
- _("Nautilus: File copy conflict"),
+ _("Nautilus: Conflict while copying file"),
_("Replace"), _("Skip"), NULL);
switch (result) {
case 0:
@@ -472,7 +472,7 @@ handle_xfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
} else {
result = nautilus_simple_dialog
(xfer_info->parent_view, text,
- _("Nautilus: File copy conflict"),
+ _("Nautilus: Conflict while copying file"),
_("Replace All"), _("Replace"), _("Skip"), NULL);
switch (result) {
@@ -1068,7 +1068,7 @@ nautilus_file_operations_copy_move (const GList *item_uris,
nautilus_simple_dialog
(view,
_("You cannot copy items into the Trash."),
- _("Nautilus: Error copying"),
+ _("Nautilus: Can't copy to Trash"),
GNOME_STOCK_BUTTON_OK, NULL, NULL);
result = GNOME_VFS_ERROR_NOT_PERMITTED;
}
@@ -1083,9 +1083,11 @@ nautilus_file_operations_copy_move (const GList *item_uris,
nautilus_simple_dialog
(view,
((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
- ? _("You cannot move the Trash.")
+ ? _("The Trash must remain on the desktop.")
: _("You cannot copy the Trash."),
- _("Nautilus: Error moving to Trash"),
+ ((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
+ ? _("Nautilus: Can't change Trash location")
+ : _("Nautilus: Can't copy Trash"),
GNOME_STOCK_BUTTON_OK, NULL, NULL);
result = GNOME_VFS_ERROR_NOT_PERMITTED;
@@ -1102,8 +1104,8 @@ nautilus_file_operations_copy_move (const GList *item_uris,
nautilus_simple_dialog
(view,
((move_options & GNOME_VFS_XFER_REMOVESOURCE) != 0)
- ? _("You cannot move an item into itself.")
- : _("You cannot copy an item into itself."),
+ ? _("You cannot move a folder into itself.")
+ : _("You cannot copy a folder into itself."),
_("Nautilus: Error moving into self"),
GNOME_STOCK_BUTTON_OK, NULL, NULL);
@@ -1260,8 +1262,8 @@ nautilus_file_operations_move_to_trash (const GList *item_uris,
if (gnome_vfs_uri_equal (source_uri, trash_dir_uri)) {
nautilus_simple_dialog
(parent_view,
- _("You cannot throw away the Trash."),
- _("Nautilus: Error throwing away Trash"),
+ _("The Trash must remain on the desktop."),
+ _("Nautilus: Can't change Trash location"),
GNOME_STOCK_BUTTON_OK, NULL, NULL);
bail = TRUE;
} else if (gnome_vfs_uri_is_parent (source_uri, trash_dir_uri, TRUE)) {