diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-10-17 13:15:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 14:51:45 -0700 |
| commit | 87cb7845fee4f23434da8b601583dab225dd85d6 (patch) | |
| tree | 2c3651a30547111f1a59a817491b365931fc19a6 /convert.c | |
| parent | f25dfb5e8d26204e58d60a6fc209e4ae65827d83 (diff) | |
| download | git-87cb7845fee4f23434da8b601583dab225dd85d6.tar.gz git-87cb7845fee4f23434da8b601583dab225dd85d6.tar.xz | |
i18n: convert mark error messages for translation
Mark error messages about CRLF for translation.
Update test to reflect changes.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
| -rw-r--r-- | convert.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -197,17 +197,21 @@ static void check_safe_crlf(const char *path, enum crlf_action crlf_action, * CRLFs would not be restored by checkout */ if (checksafe == SAFE_CRLF_WARN) - warning("CRLF will be replaced by LF in %s.\nThe file will have its original line endings in your working directory.", path); + warning(_("CRLF will be replaced by LF in %s.\n" + "The file will have its original line" + " endings in your working directory."), path); else /* i.e. SAFE_CRLF_FAIL */ - die("CRLF would be replaced by LF in %s.", path); + die(_("CRLF would be replaced by LF in %s."), path); } else if (old_stats->lonelf && !new_stats->lonelf ) { /* * CRLFs would be added by checkout */ if (checksafe == SAFE_CRLF_WARN) - warning("LF will be replaced by CRLF in %s.\nThe file will have its original line endings in your working directory.", path); + warning(_("LF will be replaced by CRLF in %s.\n" + "The file will have its original line" + " endings in your working directory."), path); else /* i.e. SAFE_CRLF_FAIL */ - die("LF would be replaced by CRLF in %s", path); + die(_("LF would be replaced by CRLF in %s"), path); } } |