diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-04-10 19:34:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-04-12 00:12:53 -0700 |
| commit | c7f426d4bc38982fe4e64bf3ed4673ddb03c3374 (patch) | |
| tree | 008fed6a8d86a99888db99c0dd215d78f51e5430 /builtin | |
| parent | i18n: mark merge "Could not read from" message for translation (diff) | |
| download | tgif-c7f426d4bc38982fe4e64bf3ed4673ddb03c3374.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7eda05d86f..6e63c08393 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -962,16 +962,16 @@ static int setup_with_upstream(const char ***argv) const char **args; if (!branch) - die("No current branch."); + die(_("No current branch.")); if (!branch->remote) - die("No remote for the current branch."); + die(_("No remote for the current branch.")); if (!branch->merge_nr) - die("No default upstream defined for the current branch."); + die(_("No default upstream defined for the current branch.")); args = xcalloc(branch->merge_nr + 1, sizeof(char *)); for (i = 0; i < branch->merge_nr; i++) { if (!branch->merge[i]->dst) - die("No remote tracking branch for %s from %s", + die(_("No remote tracking branch for %s from %s"), branch->merge[i]->src, branch->remote_name); args[i] = branch->merge[i]->dst; } |