No it doesn't breaks N_ macro. Will resend the patch. 2015-01-09 2:05 GMT+06:00 Junio C Hamano <[email protected]>: > Alexander Kuleshov <[email protected]> writes: > >> Signed-off-by: Alexander Kuleshov <[email protected]> >> --- > > s/Indentation for/line-wrap/, perhaps? > > What the patch wants to do makes sense to me, but I haven't seen a > long multi-line string, each lines in which is terminated with "\n\" > in the source, fed to N_() macro anywhere else in the existing > codebase, which makes me a bit nervous. > > Would writing it this way instead, i.e. making it more obvious where > each line begins and how long the indentation of subsequent lines are, > also work? > > N_("git show-branch [-a|--all] ...\n" > " [--current] [--color[=<when>]] ...\n" > ... > " [--no-name ..."); > > Or does it break N_() macro? > > Thanks. > > >> builtin/show-branch.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/builtin/show-branch.c b/builtin/show-branch.c >> index 270e39c..2e60107 100644 >> --- a/builtin/show-branch.c >> +++ b/builtin/show-branch.c >> @@ -6,7 +6,10 @@ >> #include "parse-options.h" >> >> static const char* show_branch_usage[] = { >> - N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | >> --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] >> [--more=<n> | --list | --independent | --merge-base] [--no-name | >> --sha1-name] [--topics] [(<rev> | <glob>)...]"), >> + N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | >> --date-order]\n\ >> + [--current] [--color[=<when>] | --no-color] >> [--sparse]\n\ >> + [--more=<n> | --list | --independent | >> --merge-base]\n\ >> + [--no-name | --sha1-name] [--topics] [(<rev> | >> <glob>)...]"), >> N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"), >> NULL >> };
-- _________________________ 0xAX -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
