diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 20:14:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 20:14:47 (GMT) |
| commit | a5ed26702b438de0ca90d11bd314596773f3c4aa (patch) | |
| tree | b01381e58d820c8a0913b8b3c0d7f544ed28ec98 /diff.c | |
| parent | 9fcd14491d32d76c3533ba0b1dfe7cabf31fe852 (diff) | |
| parent | db424979a83c11d7e3389ed505b13e7e718132ec (diff) | |
| download | git-a5ed26702b438de0ca90d11bd314596773f3c4aa.zip git-a5ed26702b438de0ca90d11bd314596773f3c4aa.tar.gz git-a5ed26702b438de0ca90d11bd314596773f3c4aa.tar.bz2 | |
Merge branch 'va/i18n'
More i18n.
* va/i18n:
i18n: diff: mark warnings for translation
i18n: credential-cache--daemon: mark advice for translation
i18n: convert mark error messages for translation
i18n: apply: mark error message for translation
i18n: apply: mark error messages for translation
i18n: apply: mark info messages for translation
i18n: apply: mark plural string for translation
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -4680,25 +4680,25 @@ static int is_summary_empty(const struct diff_queue_struct *q) } static const char rename_limit_warning[] = -"inexact rename detection was skipped due to too many files."; +N_("inexact rename detection was skipped due to too many files."); static const char degrade_cc_to_c_warning[] = -"only found copies from modified paths due to too many files."; +N_("only found copies from modified paths due to too many files."); static const char rename_limit_advice[] = -"you may want to set your %s variable to at least " -"%d and retry the command."; +N_("you may want to set your %s variable to at least " + "%d and retry the command."); void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc) { if (degraded_cc) - warning(degrade_cc_to_c_warning); + warning(_(degrade_cc_to_c_warning)); else if (needed) - warning(rename_limit_warning); + warning(_(rename_limit_warning)); else return; if (0 < needed && needed < 32767) - warning(rename_limit_advice, varname, needed); + warning(_(rename_limit_advice), varname, needed); } void diff_flush(struct diff_options *options) |