diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 23:09:17 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 23:09:18 (GMT) |
commit | 8969feac7ee119dc3cdae0e2d8c65516aa8f4045 (patch) | |
tree | 1007bab435d4c18d829ebba5975bede43e4c9f9c /ident.c | |
parent | e447d3182cf77f45402b6fc8a357a2ab466c49dd (diff) | |
parent | 850251f33be0e1d0a30d11285b618bdce23be3d7 (diff) | |
download | git-8969feac7ee119dc3cdae0e2d8c65516aa8f4045.zip git-8969feac7ee119dc3cdae0e2d8c65516aa8f4045.tar.gz git-8969feac7ee119dc3cdae0e2d8c65516aa8f4045.tar.bz2 |
Merge branch 'va/i18n-more'
Even more i18n.
* va/i18n-more:
i18n: stash: mark messages for translation
i18n: notes-merge: mark die messages for translation
i18n: ident: mark hint for translation
i18n: i18n: diff: mark die messages for translation
i18n: connect: mark die messages for translation
i18n: commit: mark message for translation
Diffstat (limited to 'ident.c')
-rw-r--r-- | ident.c | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -331,17 +331,17 @@ person_only: } static const char *env_hint = -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account\'s default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n"; +N_("\n" + "*** Please tell me who you are.\n" + "\n" + "Run\n" + "\n" + " git config --global user.email \"you@example.com\"\n" + " git config --global user.name \"Your Name\"\n" + "\n" + "to set your account\'s default identity.\n" + "Omit --global to set the identity only in this repository.\n" + "\n"); const char *fmt_ident(const char *name, const char *email, const char *date_str, int flag) @@ -356,13 +356,13 @@ const char *fmt_ident(const char *name, const char *email, if (!name) { if (strict && ident_use_config_only && !(ident_config_given & IDENT_NAME_GIVEN)) { - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); die("no name was given and auto-detection is disabled"); } name = ident_default_name(); using_default = 1; if (strict && default_name_is_bogus) { - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); die("unable to auto-detect name (got '%s')", name); } } @@ -370,7 +370,7 @@ const char *fmt_ident(const char *name, const char *email, struct passwd *pw; if (strict) { if (using_default) - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); die("empty ident name (for <%s>) not allowed", email); } pw = xgetpwuid_self(NULL); @@ -381,12 +381,12 @@ const char *fmt_ident(const char *name, const char *email, if (!email) { if (strict && ident_use_config_only && !(ident_config_given & IDENT_MAIL_GIVEN)) { - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); die("no email was given and auto-detection is disabled"); } email = ident_default_email(); if (strict && default_email_is_bogus) { - fputs(env_hint, stderr); + fputs(_(env_hint), stderr); die("unable to auto-detect email address (got '%s')", email); } } |