Subject: [PATCH] i18n: mark progress strings for translation

From: Nguyễn Thái Ngọc Duy <[email-masked]>
Date: Sat, 11 Aug 2012 18:25:04 +0700

Signed-off-by: Nguyễn Thái Ngọc Duy <[email-masked]>
---
 I know it's late in the cycle so let's queue it for the next one
 before I forget it.
 
 I'm after the "done\n" in index-pack but we should also make it
 possible to translate units (especially "bytes" which is plural).
 There are ellipsis elsewhere in this file but I don't think it's
 worth translating.

 progress.c | 15 ++++++++-------
 1 tập tin đã bị thay đổi, 8 được thêm vào(+), 7 bị xóa(-)

diff --git a/progress.c b/progress.c
index 3971f49..b69d657 100644
--- a/progress.c
+++ b/progress.c
@@ -9,6 +9,7 @@
  */
 
 #include "git-compat-util.h"
+#include "gettext.h"
 #include "progress.h"
 
 #define TP_IDX_MAX      8
@@ -117,29 +118,29 @@ static void throughput_string(struct throughput *tp, off_t total,
 {
 	int l = sizeof(tp->display);
 	if (total > 1 << 30) {
-		l -= snprintf(tp->display, l, ", %u.%2.2u GiB",
+		l -= snprintf(tp->display, l, _(", %u.%2.2u GiB"),
 			      (int)(total >> 30),
 			      (int)(total & ((1 << 30) - 1)) / 10737419);
 	} else if (total > 1 << 20) {
 		int x = total + 5243;  /* for rounding */
-		l -= snprintf(tp->display, l, ", %u.%2.2u MiB",
+		l -= snprintf(tp->display, l, _(", %u.%2.2u MiB"),
 			      x >> 20, ((x & ((1 << 20) - 1)) * 100) >> 20);
 	} else if (total > 1 << 10) {
 		int x = total + 5;  /* for rounding */
-		l -= snprintf(tp->display, l, ", %u.%2.2u KiB",
+		l -= snprintf(tp->display, l, _(", %u.%2.2u KiB"),
 			      x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
 	} else {
-		l -= snprintf(tp->display, l, ", %u bytes", (int)total);
+		l -= snprintf(tp->display, l, _(", %u bytes"), (int)total);
 	}
 
 	if (rate > 1 << 10) {
 		int x = rate + 5;  /* for rounding */
 		snprintf(tp->display + sizeof(tp->display) - l, l,
-			 " | %u.%2.2u MiB/s",
+			 _(" | %u.%2.2u MiB/s"),
 			 x >> 10, ((x & ((1 << 10) - 1)) * 100) >> 10);
 	} else if (rate)
 		snprintf(tp->display + sizeof(tp->display) - l, l,
-			 " | %u KiB/s", rate);
+			 _(" | %u KiB/s"), rate);
 }
 
 void display_throughput(struct progress *progress, off_t total)
@@ -236,7 +237,7 @@ struct progress *start_progress(const char *title, unsigned total)
 
 void stop_progress(struct progress **p_progress)
 {
-	stop_progress_msg(p_progress, "done");
+	stop_progress_msg(p_progress, _("done"));
 }
 
 void stop_progress_msg(struct progress **p_progress, const char *msg)
-- 
1.7.12.rc2.18.g61b472e