i18n: mark merge "upstream" messages for translation
Mark the merge messages that were added in v1.7.5-rc1~17^2 (merge: merge with the default upstream branch without argument) by Junio C Hamano for translation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Apr 10, 2011 at 19:34 UTC
c7f426d4bc38982fe4e64bf3ed4673ddb03c3374
1 file changed
+4
-4
builtin/merge.c
+4
-4
@@ -962,16 +962,16 @@ static int setup_with_upstream(const char ***argv)
962
const char **args;
963
964
if (!branch)
965
- die("No current branch.");
965
+ die(_("No current branch."));
966
if (!branch->remote)
967
- die("No remote for the current branch.");
967
+ die(_("No remote for the current branch."));
968
if (!branch->merge_nr)
969
- die("No default upstream defined for the current branch.");
969
+ die(_("No default upstream defined for the current branch."));
970
971
args = xcalloc(branch->merge_nr + 1, sizeof(char *));
972
for (i = 0; i < branch->merge_nr; i++) {
973
if (!branch->merge[i]->dst)
974
- die("No remote tracking branch for %s from %s",
974
+ die(_("No remote tracking branch for %s from %s"),
975
branch->merge[i]->src, branch->remote_name);
976
args[i] = branch->merge[i]->dst;
977
}