Skip to content

Commit

Permalink
SQUASH???
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Dec 28, 2024
1 parent 85a2838 commit 5ed5a4d
Showing 1 changed file with 40 additions and 15 deletions.
55 changes: 40 additions & 15 deletions parse-options.c
Original file line number Diff line number Diff line change
Expand Up @@ -1076,23 +1076,48 @@ static int usage_argh(const struct option *opts, FILE *outfile)
!opts->argh || !!strpbrk(opts->argh, "()<>[]|");
if (opts->flags & PARSE_OPT_OPTARG)
if (opts->long_name)
s = literal ? "[=%s]" :
/* TRANSLATORS: %s is a command line argument name, `<>' prompt the user to supply a value for it.
Change only the `<>' characters to something else if you use another convention for this.
Most translations leave this message as is. */
_("[=<%s>]");
/*
* TRANSLATORS: The "<%s>" part of this string
* stands for an optional value given to a command
* line option in the long form, and "<>" is there
* as a convention to signal that it is a
* placeholder (i.e. the user should substitute it
* with the real value). If your language uses a
* different convention, you can change "<%s>" part
* to match yours, e.g. it might use "|%s|" instead,
* or if the alphabet is different enough it may use
* "%s" without any placeholder signal. Most
* translations leave this message as is.
*/
s = literal ? "[=%s]" : _("[=<%s>]");
else
s = literal ? "[%s]" :
/* TRANSLATORS: %s is a command line argument name, `<>' prompt the user to supply a value for it.
Change only the `<>' characters to something else if you use another convention for this.
Most translations leave this message as is. */
_("[<%s>]");
/*
* TRANSLATORS: The "<%s>" part of this string
* stands for an optional value given to a command
* line option in the short form, and "<>" is there
* as a convention to signal that it is a
* placeholder (i.e. the user should substitute it
* with the real value). If your language uses a
* different convention, you can change "<%s>" part
* to match yours, e.g. it might use "|%s|" instead,
* or if the alphabet is different enough it may use
* "%s" without any placeholder signal. Most
* translations leave this message as is.
*/
s = literal ? "[%s]" : _("[<%s>]");
else
s = literal ? " %s" :
/* TRANSLATORS: %s is a command line argument name, `<>' prompt the user to supply a value for it.
Change only the `<>' characters to something else if you use another convention for this.
Most translations leave this message as is. */
_(" <%s>");
/*
* TRANSLATORS: The "<%s>" part of this string stands for a
* value given to a command line option, and "<>" is there
* as a convention to signal that it is a placeholder
* (i.e. the user should substitute it with the real value).
* If your language uses a different convention, you can
* change "<%s>" part to match yours, e.g. it might use
* "|%s|" instead, or if the alphabet is different enough it
* may use "%s" without any placeholder signal. Most
* translations leave this message as is.
*/
s = literal ? " %s" : _(" <%s>");
return utf8_fprintf(outfile, s, opts->argh ? _(opts->argh) : _("..."));
}

Expand Down

0 comments on commit 5ed5a4d

Please sign in to comment.