From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Jonathan Niedier" <jrnieder@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 55/66] i18n: show-branch: mark parseopt strings for translation
Date: Mon, 20 Aug 2012 19:32:44 +0700 [thread overview]
Message-ID: <1345465975-16927-56-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1345465975-16927-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/show-branch.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index a59e088..d208fd6 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -6,8 +6,8 @@
#include "parse-options.h"
static const char* show_branch_usage[] = {
- "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>)...]",
- "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",
+ 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 (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
NULL
};
@@ -648,36 +648,36 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
const char *reflog_base = NULL;
struct option builtin_show_branch_options[] = {
OPT_BOOLEAN('a', "all", &all_heads,
- "show remote-tracking and local branches"),
+ N_("show remote-tracking and local branches")),
OPT_BOOLEAN('r', "remotes", &all_remotes,
- "show remote-tracking branches"),
+ N_("show remote-tracking branches")),
OPT__COLOR(&showbranch_use_color,
- "color '*!+-' corresponding to the branch"),
- { OPTION_INTEGER, 0, "more", &extra, "n",
- "show <n> more commits after the common ancestor",
+ N_("color '*!+-' corresponding to the branch")),
+ { OPTION_INTEGER, 0, "more", &extra, N_("n"),
+ N_("show <n> more commits after the common ancestor"),
PARSE_OPT_OPTARG, NULL, (intptr_t)1 },
- OPT_SET_INT(0, "list", &extra, "synonym to more=-1", -1),
- OPT_BOOLEAN(0, "no-name", &no_name, "suppress naming strings"),
+ OPT_SET_INT(0, "list", &extra, N_("synonym to more=-1"), -1),
+ OPT_BOOLEAN(0, "no-name", &no_name, N_("suppress naming strings")),
OPT_BOOLEAN(0, "current", &with_current_branch,
- "include the current branch"),
+ N_("include the current branch")),
OPT_BOOLEAN(0, "sha1-name", &sha1_name,
- "name commits with their object names"),
+ N_("name commits with their object names")),
OPT_BOOLEAN(0, "merge-base", &merge_base,
- "show possible merge bases"),
+ N_("show possible merge bases")),
OPT_BOOLEAN(0, "independent", &independent,
- "show refs unreachable from any other ref"),
+ N_("show refs unreachable from any other ref")),
OPT_BOOLEAN(0, "topo-order", &lifo,
- "show commits in topological order"),
+ N_("show commits in topological order")),
OPT_BOOLEAN(0, "topics", &topics,
- "show only commits not on the first branch"),
+ N_("show only commits not on the first branch")),
OPT_SET_INT(0, "sparse", &dense,
- "show merges reachable from only one tip", 0),
+ N_("show merges reachable from only one tip"), 0),
OPT_SET_INT(0, "date-order", &lifo,
- "show commits where no parent comes before its "
- "children", 0),
- { OPTION_CALLBACK, 'g', "reflog", &reflog_base, "<n>[,<base>]",
- "show <n> most recent ref-log entries starting at "
- "base",
+ N_("show commits where no parent comes before its "
+ "children"), 0),
+ { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
+ N_("show <n> most recent ref-log entries starting at "
+ "base"),
PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
parse_reflog_param },
OPT_END()
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2012-08-20 12:45 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-20 12:31 [PATCH 00/66] parseopt i18n marking (again) Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 01/66] i18n: mark "style" in OPT_COLUMN() for translation Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 02/66] i18n: archive: mark parseopt strings " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 03/66] i18n: add: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 04/66] i18n: bisect--helper: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 05/66] i18n: blame: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 06/66] i18n: branch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 07/66] i18n: cat-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 08/66] i18n: check-attr: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 09/66] i18n: checkout-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 10/66] i18n: checkout: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 11/66] i18n: cherry: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 12/66] i18n: clean: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 13/66] i18n: clone: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 14/66] i18n: column: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 15/66] i18n: commit: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 16/66] i18n: config: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 17/66] i18n: count-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 18/66] i18n: describe: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 19/66] i18n: fast-export: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 20/66] i18n: fetch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 21/66] i18n: fmt-merge-msg: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 22/66] i18n: for-each-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 23/66] i18n: format-patch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 24/66] i18n: fsck: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 25/66] i18n: gc: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 26/66] i18n: grep: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 27/66] i18n: hash-object: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 28/66] i18n: help: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 29/66] i18n: init-db: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 30/66] i18n: log: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 31/66] i18n: ls-files: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 32/66] i18n: ls-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 33/66] i18n: merge-base: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 34/66] i18n: merge-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 35/66] i18n: merge: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 36/66] i18n: mktree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 37/66] i18n: mv: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 38/66] i18n: name-rev: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 39/66] i18n: notes: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 40/66] i18n: pack-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 41/66] i18n: pack-refs: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 42/66] i18n: prune-packed: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 43/66] i18n: prune: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 44/66] i18n: push: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 45/66] i18n: read-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 46/66] i18n: remote: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 47/66] i18n: replace: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 48/66] i18n: status: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 49/66] i18n: rerere: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 50/66] i18n: reset: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 51/66] i18n: rev-parse: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 52/66] i18n: revert, cherry-pick: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 53/66] i18n: rm: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 54/66] i18n: shortlog: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-20 12:32 ` [PATCH 56/66] i18n: show-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 57/66] i18n: symbolic-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 58/66] i18n: tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 59/66] i18n: update-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 60/66] i18n: update-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 61/66] i18n: update-server-info: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 62/66] i18n: verify-pack: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 63/66] i18n: verify-tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 64/66] i18n: write-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 65/66] Reduce translations by using same terminologies Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 66/66] Use imperative form in help usage to describe an action Nguyễn Thái Ngọc Duy
2012-08-22 18:32 ` Drew Northup
2012-08-20 22:55 ` [PATCH 00/66] parseopt i18n marking (again) Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345465975-16927-56-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@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.
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 NNTP newsgroup(s).