On Mon, Feb 29, 2016 at 3:11 AM, Matthieu Moy <Matthieu.Moy@xxxxxxx> wrote:
> diff --git a/lockfile.c b/lockfile.c
> index 80d056d..a7d6175 100644
> --- a/lockfile.c
> +++ b/lockfile.c
> @@ -150,9 +150,11 @@ 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"
> - "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.",
> + "Another git process seems to be running in this repository.\n"
> + "Please terminate it (e.g. quit any text editor that git may be\n"
> + "waiting for) and try again. If no other git process is running,\n"
> + "then a process may have crashed in this repository earlier:\n"
> + "remove the file manually to continue.",
> absolute_path(path), strerror(err));
i18n police checking in :) This message looks very much translatable.
Could you check if that's true while you're touching this code, and if
so _() it?
> } else
> strbuf_addf(buf, "Unable to create '%s.lock': %s",
also this one, I think.
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html