From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 20 Aug 2012 12:32:38 +0000 (+0700)
Subject: i18n: rerere: mark parseopt strings for translation
X-Git-Tag: v1.8.0-rc0~95^2~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ff07f24323cd991b40204b8eeb15aa7b80903da;p=git.git

i18n: rerere: mark parseopt strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 08213c7c0..dc1708e6d 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -8,7 +8,7 @@
 #include "xdiff-interface.h"
 
 static const char * const rerere_usage[] = {
-	"git rerere [clear | forget path... | status | remaining | diff | gc]",
+	N_("git rerere [clear | forget path... | status | remaining | diff | gc]"),
 	NULL,
 };
 
@@ -53,7 +53,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 
 	struct option options[] = {
 		OPT_SET_INT(0, "rerere-autoupdate", &autoupdate,
-			"register clean resolutions in index", 1),
+			N_("register clean resolutions in index"), 1),
 		OPT_END(),
 	};