Merge branch 'ja/i18n-similar-messages'
Similar message templates have been consolidated so that translators need to work on fewer number of messages. * ja/i18n-similar-messages: i18n: turn even more messages into "cannot be used together" ones i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom" i18n: factorize "--foo outside a repository" i18n: refactor "unrecognized %(foo) argument" strings i18n: factorize "no directory given for --foo" i18n: factorize "--foo requires --bar" and the like i18n: tag.c factorize i18n strings i18n: standardize "cannot open" and "cannot read" i18n: turn "options are incompatible" into "cannot be used together" i18n: refactor "%s, %s and %s are mutually exclusive" i18n: refactor "foo and bar are mutually exclusive"
This commit is contained in:
@ -996,7 +996,7 @@ static int open_fetch_head(struct fetch_head *fetch_head)
|
||||
if (write_fetch_head) {
|
||||
fetch_head->fp = fopen(filename, "a");
|
||||
if (!fetch_head->fp)
|
||||
return error_errno(_("cannot open %s"), filename);
|
||||
return error_errno(_("cannot open '%s'"), filename);
|
||||
strbuf_init(&fetch_head->buf, 0);
|
||||
} else {
|
||||
fetch_head->fp = NULL;
|
||||
@ -1408,7 +1408,7 @@ static int truncate_fetch_head(void)
|
||||
FILE *fp = fopen_for_writing(filename);
|
||||
|
||||
if (!fp)
|
||||
return error_errno(_("cannot open %s"), filename);
|
||||
return error_errno(_("cannot open '%s'"), filename);
|
||||
fclose(fp);
|
||||
return 0;
|
||||
}
|
||||
@ -2030,12 +2030,12 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
|
||||
if (deepen_relative < 0)
|
||||
die(_("negative depth in --deepen is not supported"));
|
||||
if (depth)
|
||||
die(_("--deepen and --depth are mutually exclusive"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--deepen", "--depth");
|
||||
depth = xstrfmt("%d", deepen_relative);
|
||||
}
|
||||
if (unshallow) {
|
||||
if (depth)
|
||||
die(_("--depth and --unshallow cannot be used together"));
|
||||
die(_("options '%s' and '%s' cannot be used together"), "--depth", "--unshallow");
|
||||
else if (!is_repository_shallow(the_repository))
|
||||
die(_("--unshallow on a complete repository does not make sense"));
|
||||
else
|
||||
|
Reference in New Issue
Block a user