From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:26:31 +0000 (-0700)
Subject: Merge branch 'nd/i18n-progress'
X-Git-Tag: v2.0.0-rc0~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0963008cbf266db8001521c87084cea353005020;p=thirdparty%2Fgit.git

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
---

0963008cbf266db8001521c87084cea353005020
diff --cc builtin/pack-objects.c
index c73337931b,91b861248b..8b89f8121a
--- a/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 {