aboutsummaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-04-14 09:54:35 +0200
committerJunio C Hamano <gitster@pobox.com>2012-04-15 14:26:08 -0700
commit647202889397e775c294234ebd3df8b2c4473f0f (patch)
tree880bd4dc5cea477730ff42d194df4c03f90b2559 /sha1_name.c
parent17c82211ec2d29a6e7221948cba8dae9074dc5a6 (diff)
downloadgit-647202889397e775c294234ebd3df8b2c4473f0f.tar.gz
git-647202889397e775c294234ebd3df8b2c4473f0f.tar.xz
i18n: mark @{upstream} error messages for translation
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 361708b7b..c6331136d 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -861,15 +861,15 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
* points to something different than a branch.
*/
if (!upstream)
- return error("HEAD does not point to a branch");
+ return error(_("HEAD does not point to a branch"));
if (!upstream->merge || !upstream->merge[0]->dst) {
if (!ref_exists(upstream->refname))
- return error("No such branch: '%s'", cp);
+ return error(_("No such branch: '%s'"), cp);
if (!upstream->merge)
- return error("No upstream configured for branch '%s'",
+ return error(_("No upstream configured for branch '%s'"),
upstream->name);
return error(
- "Upstream branch '%s' not stored as a remote-tracking branch",
+ _("Upstream branch '%s' not stored as a remote-tracking branch"),
upstream->merge[0]->src);
}
free(cp);