From: Junio C Hamano <gitster@pobox.com>
To: Jiang Xin <worldhello.net@gmail.com>
Cc: Brian Gesiak <modocache@gmail.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 0/3] extract proper comments for l10n translators
Date: Thu, 17 Apr 2014 11:12:00 -0700 [thread overview]
Message-ID: <xmqqfvlbesgf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CANYiYbGUKiOyoBOPHH+jvdZx1hKoUshh7O0KnpWUQEzbvd8TfQ@mail.gmail.com> (Jiang Xin's message of "Thu, 17 Apr 2014 13:50:56 +0800")
Jiang Xin <worldhello.net@gmail.com> writes:
> 2014-04-17 13:37 GMT+08:00 Jiang Xin <worldhello.net@gmail.com>:
>> When generate git.pot, many irrelevant comments are extracted as references
>> for translators, but one useful comment is lost. This series patches will
>> fix this issue.
>
> Brief changes of po/git.pot after applied these patches:
This is a very good way to make sure that 2/3 does not lose helpful
comments.
Thanks, but my complaint regarding the multi-line comment format
still stands.
>
> diff --git a/po/git.pot b/po/git.pot
> index f70b46b..9e474f3 100644
> --- a/po/git.pot
> +++ b/po/git.pot
> @@ -23,10 +23,6 @@ msgstr ""
> msgid "hint: %.*s\n"
> msgstr ""
>
> -#.
> -#. * Message used both when 'git commit' fails and when
> -#. * other commands doing a merge do.
> -#.
> #: advice.c:85
> msgid ""
> "Fix them up in the work tree,\n"
> @@ -399,6 +395,7 @@ msgid_plural "%lu years"
> msgstr[0] ""
> msgstr[1] ""
>
> +#. TRANSLATORS: "%s" is "<n> years"
> #: date.c:149
> #, c-format
> msgid "%s, %lu month ago"
> @@ -582,8 +579,6 @@ msgstr ""
> msgid "Removing %s to make room for subdirectory\n"
> msgstr ""
>
> -#. something else exists
> -#. .. but not some other error (who really cares what?)
> #: merge-recursive.c:700 merge-recursive.c:721
> msgid ": perhaps a D/F conflict?"
> msgstr ""
> @@ -899,11 +894,6 @@ msgstr ""
> msgid "Pathspec '%s' is in submodule '%.*s'"
> msgstr ""
>
> -#.
> -#. * We may want to substitute "this command" with a command
> -#. * name. E.g. when add--interactive dies when running
> -#. * "checkout -p"
> -#.
> #: pathspec.c:353
> #, c-format
> msgid "%s: pathspec magic not supported by this command: %s"
> @@ -953,11 +943,6 @@ msgstr ""
> msgid "%s tracks both %s and %s"
> msgstr ""
>
> -#.
> -#. * This last possibility doesn't occur because
> -#. * FETCH_HEAD_IGNORE entries always appear at
> -#. * the end of the list.
> -#.
> #: remote.c:774
> msgid "Internal error"
> msgstr ""
> @@ -1306,13 +1291,11 @@ msgstr ""
> msgid "Could not find section in .gitmodules where path=%s"
> msgstr ""
>
> -#. Maybe the user already did that, don't error out here
> #: submodule.c:76
> #, c-format
> msgid "Could not update .gitmodules entry %s"
> msgstr ""
>
> -#. Maybe the user already did that, don't error out here
> #: submodule.c:109
> #, c-format
> msgid "Could not remove .gitmodules entry for %s"
> @@ -1884,7 +1867,6 @@ msgstr ""
> msgid "add changes from all tracked and untracked files"
> msgstr ""
>
> -#. takes no arguments
> #: builtin/add.c:260
> msgid "ignore paths removed in the working tree (same as --no-all)"
> msgstr ""
> @@ -2044,7 +2026,6 @@ msgstr ""
> msgid "corrupt binary patch at line %d: %.*s"
> msgstr ""
>
> -#. there has to be one hunk (forward hunk)
> #: builtin/apply.c:1900
> #, c-format
> msgid "unrecognized binary patch at line %d"
> @@ -2232,7 +2213,6 @@ msgstr ""
> msgid "internal error"
> msgstr ""
>
> -#. Say this even without --verbose
> #: builtin/apply.c:4043
> #, c-format
> msgid "Applying patch %%s with %d reject..."
> @@ -3232,7 +3212,6 @@ msgstr ""
> msgid " ... and %d more.\n"
> msgstr ""
>
> -#. The singular version
> #: builtin/checkout.c:711
> #, c-format
> msgid ""
> @@ -3280,7 +3259,6 @@ msgstr ""
> msgid "invalid reference: %s"
> msgstr ""
>
> -#. case (1): want a tree
> #: builtin/checkout.c:1002
> #, c-format
> msgid "reference is not a tree: %s"
> @@ -4276,7 +4254,6 @@ msgstr ""
> msgid "GPG sign commit"
> msgstr ""
>
> -#. end commit message options
> #: builtin/commit.c:1508
> msgid "Commit contents options"
> msgstr ""
> @@ -5140,7 +5117,6 @@ msgstr ""
> msgid "See \"git help gc\" for manual housekeeping.\n"
> msgstr ""
>
> -#. be quiet on --auto
> #: builtin/gc.c:336
> #, c-format
> msgid ""
> @@ -5894,12 +5870,10 @@ msgstr ""
> msgid "unable to move %s to %s"
> msgstr ""
>
> -#.
> -#. * TRANSLATORS: The first '%s' is either "Reinitialized
> -#. * existing" or "Initialized empty", the second " shared" or
> -#. * "", and the last '%s%s' is the verbatim directory name.
> -#.
> -#: builtin/init-db.c:420
> +#. TRANSLATORS: The first '%s' is either "Reinitialized
> +#. existing" or "Initialized empty", the second " shared" or
> +#. "", and the last '%s%s' is the verbatim directory name.
> +#: builtin/init-db.c:418
> #, c-format
> msgid "%s%s Git repository in %s%s\n"
> msgstr ""
> @@ -6627,7 +6601,6 @@ msgstr ""
> msgid "Commit %s has a bad GPG signature allegedly by %s."
> msgstr ""
>
> -#. 'N'
> #: builtin/merge.c:1279
> #, c-format
> msgid "Commit %s does not have a GPG signature."
> @@ -9593,8 +9566,6 @@ msgstr ""
> msgid "'git bisect bad' can take only one argument."
> msgstr ""
>
> -#. have bad but not good. we could bisect although
> -#. this is less optimum.
> #: git-bisect.sh:273
> msgid "Warning: bisecting only with a bad commit."
> msgstr ""
> @@ -9690,10 +9661,6 @@ msgstr ""
> msgid "updating an unborn branch with changes added to the index"
> msgstr ""
>
> -#. The fetch involved updating the current branch.
> -#. The working tree and the index file is still based on the
> -#. $orig_head commit, but we are merging into $curr_head.
> -#. First update the working tree to match $curr_head.
> #: git-pull.sh:271
> #, sh-format
> msgid ""
> @@ -9835,7 +9802,6 @@ msgstr ""
> msgid "Changes from $mb to $onto:"
> msgstr ""
>
> -#. Detach HEAD and reset the tree
> #: git-rebase.sh:609
> msgid "First, rewinding head to replay your work on top of it..."
> msgstr ""
> @@ -10218,7 +10184,6 @@ msgstr ""
> msgid "The --cached option cannot be used with the --files option"
> msgstr ""
>
> -#. unexpected type
> #: git-submodule.sh:1097
> #, sh-format
> msgid "unexpected mode $mod_dst"
next prev parent reply other threads:[~2014-04-17 18:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-16 22:51 [l10n] date: Note for translators not included in .po files Brian Gesiak
2014-04-17 1:41 ` Jiang Xin
2014-04-17 5:37 ` [PATCH 0/3] extract proper comments for l10n translators Jiang Xin
2014-04-17 5:50 ` Jiang Xin
2014-04-17 18:12 ` Junio C Hamano [this message]
2014-04-17 5:37 ` [PATCH 1/3] i18n: Fixes uncatchable comments for translators Jiang Xin
2014-04-17 5:37 ` [PATCH 2/3] i18n: Only extract comments marked by special tag Jiang Xin
2014-04-17 18:08 ` Junio C Hamano
2014-04-18 6:03 ` Jiang Xin
2014-04-18 16:52 ` Junio C Hamano
2014-04-18 17:48 ` Junio C Hamano
2014-04-17 5:37 ` [PATCH 3/3] i18n: Remove obsolete comments for translators Jiang Xin
2014-04-17 6:27 ` [l10n] date: Note for translators not included in .po files Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfvlbesgf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=modocache@gmail.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).