[nautilus] file-operations: show current file counter and total files

[Cosimo Cecchi <cosimoc src gnome org>]

commit 024381aac07aeb7ed161913e601fcefbf4e3f990
Author: Marcus Carlson <mdc src gnome org>
Date:   Mon Jan 16 09:56:00 2012 -0500

    file-operations: show current file counter and total files
    
    Change the file operation strings so that both the current file counter
    and the total number of files are shown in the UI.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=606955

 libnautilus-private/nautilus-file-operations.c |   41 ++++++++++--------------
 1 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 7db7fa7..55fca11 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -2884,43 +2884,36 @@ report_copy_progress (CopyMoveJob *copy_job,
 			   copy_job->files->next == NULL) {
 			if (copy_job->destination != NULL) {
 				nautilus_progress_info_take_status (job->progress,
-								    f (is_move?
-								       ngettext ("Moving %'d file (in \"%B\") to \"%B\"",
-										 "Moving %'d files (in \"%B\") to \"%B\"",
-										 files_left)
+								    f (is_move ?
+								       _("Moving file %'d of %'d (in \"%B\") to \"%B\"")
 								       :
-								       ngettext ("Copying %'d file (in \"%B\") to \"%B\"",
-										 "Copying %'d files (in \"%B\") to \"%B\"",
-										 files_left),
-								       files_left,
+								       _("Copying file %'d of %'d (in \"%B\") to \"%B\""),
+								       transfer_info->num_files,
+								       source_info->num_files,
 								       (GFile *)copy_job->files->data,
 								       copy_job->destination));
 			} else {
 				nautilus_progress_info_take_status (job->progress,
-								    f (ngettext ("Duplicating %'d file (in \"%B\")",
-										 "Duplicating %'d files (in \"%B\")",
-										 files_left),
-								       files_left,
+								    f (_("Duplicating file %'d of %'d (in \"%B\")"),
+								       transfer_info->num_files,
+								       source_info->num_files,
 								       (GFile *)copy_job->files->data));
 			}
 		} else {
 			if (copy_job->destination != NULL) {
 				nautilus_progress_info_take_status (job->progress,
-								    f (is_move?
-								       ngettext ("Moving %'d file to \"%B\"",
-										 "Moving %'d files to \"%B\"",
-										 files_left)
+								    f (is_move ?
+								       _("Moving file %'d of %'d to \"%B\"")
 								       :
-								       ngettext ("Copying %'d file to \"%B\"",
-										 "Copying %'d files to \"%B\"",
-										 files_left),
-								       files_left, copy_job->destination));
+								       _ ("Copying file %'d of %'d to \"%B\""),
+								       transfer_info->num_files,
+								       source_info->num_files,
+								       copy_job->destination));
 			} else {
 				nautilus_progress_info_take_status (job->progress,
-								    f (ngettext ("Duplicating %'d file",
-										 "Duplicating %'d files",
-										 files_left),
-								       files_left));
+								    f (_("Duplicating file %'d of %'d"),
+								       transfer_info->num_files,
+								       source_info->num_files));
 			}
 		}
 	}