undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: merge: mark messages for translation

Browse Source 
Mark messages shown to the user for translation.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-06-17 20:21:17 +00:00 committed by Junio C Hamano
parent b34c77e33e
commit bef4830e88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/merge.c
View File

@ -1014,7 +1014,7 @@ static int default_edit_option(void)
if (e) { if (e) {
int v = git_config_maybe_bool(name, e); int v = git_config_maybe_bool(name, e);
if (v < 0) if (v < 0)
die("Bad value '%s' in environment '%s'", e, name); die(_("Bad value '%s' in environment '%s'"), e, name);
return v; return v;
} }
@ -1115,7 +1115,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
if (!commit) { if (!commit) {
if (ptr) if (ptr)
*ptr = '\0'; *ptr = '\0';
die("not something we can merge in %s: %s", die(_("not something we can merge in %s: %s"),
filename, merge_names->buf + pos); filename, merge_names->buf + pos);
} }
remotes = &commit_list_insert(commit, remotes)->next; remotes = &commit_list_insert(commit, remotes)->next;
@ -1149,7 +1149,7 @@ static struct commit_list *collect_parents(struct commit *head_commit,
struct commit *commit = get_merge_parent(argv[i]); struct commit *commit = get_merge_parent(argv[i]);
if (!commit) if (!commit)
help_unknown_ref(argv[i], "merge", help_unknown_ref(argv[i], "merge",
"not something we can merge"); _("not something we can merge"));
remotes = &commit_list_insert(commit, remotes)->next; remotes = &commit_list_insert(commit, remotes)->next;
} }
remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads); remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
@ -1421,7 +1421,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* If head can reach all the merge then we are up to date. * If head can reach all the merge then we are up to date.
* but first the most common case of merging one remote. * but first the most common case of merging one remote.
*/ */
finish_up_to_date("Already up-to-date."); finish_up_to_date(_("Already up-to-date."));
goto done; goto done;
} else if (fast_forward != FF_NO && !remoteheads->next && } else if (fast_forward != FF_NO && !remoteheads->next &&
!common->next && !common->next &&
@ -1506,7 +1506,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
} }
} }
if (up_to_date) { if (up_to_date) {
finish_up_to_date("Already up-to-date. Yeeah!"); finish_up_to_date(_("Already up-to-date. Yeeah!"));
goto done; goto done;
} }
} }