i18n: mark merge CHERRY_PICK_HEAD messages for translation

avar · gitster · commit f68f1801726e · 2011-04-12T00:12:53.000-07:00
Mark CHERRY_PICK_HEAD related messages in builtin/merge.c that were
added in v1.7.5-rc0~88^2~2 (Introduce CHERRY_PICK_HEAD) by Jay Soffian
for translation.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -1043,10 +1043,10 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	}
 	if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
 		if (advice_resolve_conflict)
-			die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-			    "Please, commit your changes before you can merge.");
+			die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+			    "Please, commit your changes before you can merge."));
 		else
-			die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).");
+			die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
 	}
 	resolve_undo_clear();
 

Original file line number	Diff line number	Diff line change
`@@ -1043,10 +1043,10 @@ int cmd_merge(int argc, const char *argv, const char prefix)`
`1043`	`1043`	`}`
`1044`	`1044`	`if (file_exists(git_path("CHERRY_PICK_HEAD"))) {`
`1045`	`1045`	`if (advice_resolve_conflict)`
`1046`		`- die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"`
`1047`		`- "Please, commit your changes before you can merge.");`
	`1046`	`+ die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"`
	`1047`	`+ "Please, commit your changes before you can merge."));`
`1048`	`1048`	`else`
`1049`		`- die("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).");`
	`1049`	`+ die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));`
`1050`	`1050`	`}`
`1051`	`1051`	`resolve_undo_clear();`
`1052`	`1052`