Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
lockfile: mark strings for translation
author
Matthieu Moy
<Matthieu.Moy@imag.fr>
Tue, 1 Mar 2016 17:04:09 +0000
(18:04 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 1 Mar 2016 18:16:45 +0000
(10:16 -0800)
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
lockfile.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f02fbc4
)
diff --git
a/lockfile.c
b/lockfile.c
index 80d056d2ede0a5279c0b5c05c35b46336f564533..62583d128156099eb49267af839bed1589ca5375 100644
(file)
--- a/
lockfile.c
+++ b/
lockfile.c
@@
-149,13
+149,13
@@
static int lock_file_timeout(struct lock_file *lk, const char *path,
void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
{
if (err == EEXIST) {
void unable_to_lock_message(const char *path, int err, struct strbuf *buf)
{
if (err == EEXIST) {
- strbuf_addf(buf, "Unable to create '%s.lock': %s.\n\n"
+ strbuf_addf(buf,
_(
"Unable to create '%s.lock': %s.\n\n"
"If no other git process is currently running, this probably means a\n"
"git process crashed in this repository earlier. Make sure no other git\n"
"If no other git process is currently running, this probably means a\n"
"git process crashed in this repository earlier. Make sure no other git\n"
- "process is running and remove the file manually to continue.",
+ "process is running and remove the file manually to continue."
)
,
absolute_path(path), strerror(err));
} else
absolute_path(path), strerror(err));
} else
- strbuf_addf(buf,
"Unable to create '%s.lock': %s"
,
+ strbuf_addf(buf,
_("Unable to create '%s.lock': %s")
,
absolute_path(path), strerror(err));
}
absolute_path(path), strerror(err));
}