Merge branch 'nd/i18n-progress'

Mark the progress indicators from various time-consuming commands
for i18n/l10n.

* nd/i18n-progress:
  i18n: mark all progress lines for translation

diff --cc builtin/pack-objects.c
index c733379,91b8612..8b89f81
--- 1/builtin/pack-objects.c
--- 2/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -755,8 -723,8 +755,8 @@@ static void write_pack_file(void
        struct object_entry **write_order;
  
        if (progress > pack_to_stdout)
-               progress_state = start_progress("Writing objects", nr_result);
+               progress_state = start_progress(_("Writing objects"), nr_result);
 -      written_list = xmalloc(nr_objects * sizeof(*written_list));
 +      written_list = xmalloc(to_pack.nr_objects * sizeof(*written_list));
        write_order = compute_write_order();
  
        do {

diff --cc diffcore-rename.c
Simple merge

diff --cc unpack-trees.c
Simple merge