Signed-off-by: Jiang Xin worldhello@gmail.com
Reviewed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Not mark BUG: impossible combination of %d and %p, which would
never happen.
branch.c | 38 +++---
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/branch.c b/branch.c
index 6ae6a..4ddd69 100644
--- a/branch.c
+++ b/branch.c
@@ -57,7 +57,7 @@ void install_branch_config(int flag, const char *local, const
char *origin, cons
if (remote_is_branch
!strcmp(local, shortname)
!origin) {
- warning(Not setting branch %s as its own upstream.,
+ warning(_(Not setting branch %s as its own upstream.),
local);
return;
}
@@ -79,23 +79,23 @@ void install_branch_config(int flag, const char *local,
const char *origin, cons
if (flag BRANCH_CONFIG_VERBOSE) {
if (remote_is_branch origin)
printf(rebasing ?
- Branch %s set up to track remote branch %s from
%s by rebasing.\n :
- Branch %s set up to track remote branch %s from
%s.\n,
+ _(Branch %s set up to track remote branch %s
from %s by rebasing.\n) :
+ _(Branch %s set up to track remote branch %s
from %s.\n),
local, shortname, origin);
else if (remote_is_branch !origin)
printf(rebasing ?
- Branch %s set up to track local branch %s by
rebasing.\n :
- Branch %s set up to track local branch %s.\n,
+ _(Branch %s set up to track local branch %s by
rebasing.\n) :
+ _(Branch %s set up to track local branch
%s.\n),
local, shortname);
else if (!remote_is_branch origin)
printf(rebasing ?
- Branch %s set up to track remote ref %s by
rebasing.\n :
- Branch %s set up to track remote ref %s.\n,
+ _(Branch %s set up to track remote ref %s by
rebasing.\n) :
+ _(Branch %s set up to track remote ref %s.\n),
local, remote);
else if (!remote_is_branch !origin)
printf(rebasing ?
- Branch %s set up to track local ref %s by
rebasing.\n :
- Branch %s set up to track local ref %s.\n,
+ _(Branch %s set up to track local ref %s by
rebasing.\n) :
+ _(Branch %s set up to track local ref %s.\n),
local, remote);
else
die(BUG: impossible combination of %d and %p,
@@ -115,7 +115,7 @@ static int setup_tracking(const char *new_ref, const char
*orig_ref,
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
if (strlen(new_ref) 1024 - 7 - 7 - 1)
- return error(Tracking not set up: name too long: %s,
+ return error(_(Tracking not set up: name too long: %s),
new_ref);
memset(tracking, 0, sizeof(tracking));
@@ -134,7 +134,7 @@ static int setup_tracking(const char *new_ref, const char
*orig_ref,
}
if (tracking.matches 1)
- return error(Not tracking: ambiguous information for ref %s,
+ return error(_(Not tracking: ambiguous information for ref
%s),
orig_ref);
install_branch_config(config_flags, new_ref, tracking.remote,
@@ -179,12 +179,12 @@ int validate_new_branchname(const char *name, struct
strbuf *ref,
int force, int attr_only)
{
if (strbuf_check_branch_ref(ref, name))
- die('%s' is not a valid branch name., name);
+ die(_('%s' is not a valid branch name.), name);
if (!ref_exists(ref-buf))
return 0;
else if (!force !attr_only)
- die(A branch named '%s' already exists., ref-buf +
strlen(refs/heads/));
+ die(_(A branch named '%s' already exists.), ref-buf +
strlen(refs/heads/));
if (!attr_only) {
const char *head;
@@ -192,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf
*ref,
head = resolve_ref_unsafe(HEAD, sha1, 0, NULL);
if (!is_bare_repository() head !strcmp(head, ref-buf))
- die(Cannot force update the current branch.);
+ die(_(Cannot force update the current branch.));
}
return 1;
}
@@ -247,7 +247,7 @@ void create_branch(const char *head,
}
