mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ja/i18n-common-messages'

Browse Source 
Unify more messages to help l10n.

* ja/i18n-common-messages:
  i18n: fix some misformated placeholders in command synopsis
  i18n: remove from i18n strings that do not hold translatable parts
  i18n: factorize "invalid value" messages
  i18n: factorize more 'incompatible options' messages
This commit is contained in:
Junio C Hamano
2022-02-25 15:47:35 -08:00
parent a47fcfe871 9164d97a63
commit d21d5ddfe6
42 changed files with 137 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/pull.c
View File

@ -42,9 +42,9 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
return v;
if (fatal)
die(_("Invalid value for %s: %s"), key, value);
die(_("invalid value for '%s': '%s'"), key, value);
else
error(_("Invalid value for %s: %s"), key, value);
error(_("invalid value for '%s': '%s'"), key, value);
return REBASE_INVALID;
}
@ -318,7 +318,7 @@ static const char *config_get_ff(void)
if (!strcmp(value, "only"))
return "--ff-only";
die(_("Invalid value for pull.ff: %s"), value);
die(_("invalid value for '%s': '%s'"), "pull.ff", value);
}
/**