Subject: [RFC/PATCH 5/5] gettextize: git-merge: !fixup "basic messages"

From: Ævar Arnfjörð Bjarmason <[email-masked]>
Date: Sun, 31 Oct 2010 11:34:20 +0000

Gettextize a "%s: negative length %s" error message in builtin/merge.c
that I missed the first time around.

Signed-off-by: Ævar Arnfjörð Bjarmason <[email-masked]>
---
 builtin/merge.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 62bdd6c..524ef22 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -511,7 +511,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 		int is_bool;
 		shortlog_len = git_config_bool_or_int(k, v, &is_bool);
 		if (!is_bool && shortlog_len < 0)
-			return error("%s: negative length %s", k, v);
+			return error(_("%s: negative length %s"), k, v);
 		if (is_bool && shortlog_len)
 			shortlog_len = DEFAULT_MERGE_LOG_LEN;
 		return 0;
-- 
1.7.3.2.312.ge13a7