From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 06/65] i18n: blame: mark parseopt strings for translation Date: Mon, 28 May 2012 18:13:18 +0700 Message-ID: <1338203657-26486-4-git-send-email-pclouds@gmail.com> References: <1336314232-21002-3-git-send-email-pclouds@gmail.com> <1338203657-26486-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Jonathan Niedier , Junio C Hamano , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , Jiang Xin , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 28 13:19:13 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SYxyf-000604-VW for gcvg-git-2@plane.gmane.org; Mon, 28 May 2012 13:19:10 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753461Ab2E1LTF convert rfc822-to-quoted-printable (ORCPT ); Mon, 28 May 2012 07:19:05 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:48872 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228Ab2E1LTD (ORCPT ); Mon, 28 May 2012 07:19:03 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so4538023pbb.19 for ; Mon, 28 May 2012 04:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=ed8g310rfLpELeb+LqqLuECaDk4D12QPJni+Bx8+T8k=; b=Bv13Vg6s0osJPzD77Vk6pI+uIw/fjou7ZAu84pl9NXPnREtYn6XdL67p3SuS7gbxcB IM+EfQfr3X+h6GfG952NSMoRc+83eXWULiZ7ysyXfo5FoiNP6G66Ux1AOB99tE/8JjF7 YVCv6FO60tnuvjRHdKww5dSj6HxuuSilYcjpgCg2qKD6H6oPM/nJuC7LUAMQqSDDB36d 0tpD2qrbpuUr3fGkSzNd5nebCLxhAMnqBypTwEYL+L9l+vA5DHj11eIpdp0CaXQ0JEJ7 ifB+sOpdJEx3OpzbO61PgSi64hvPT+MfavL7w7ccUiax9aSa5XZtaV4diDN5hsvxHFC6 DrmA== Received: by 10.68.231.164 with SMTP id th4mr26279920pbc.97.1338203942927; Mon, 28 May 2012 04:19:02 -0700 (PDT) Received: from pclouds@gmail.com ([115.74.41.88]) by mx.google.com with ESMTPS id ny10sm18996258pbb.38.2012.05.28.04.18.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 May 2012 04:19:02 -0700 (PDT) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Mon, 28 May 2012 18:14:57 +0700 X-Mailer: git-send-email 1.7.10.2.549.g9354186 In-Reply-To: <1338203657-26486-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- builtin/blame.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 24d3dd5..fe8aa4d 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -22,12 +22,12 @@ #include "utf8.h" #include "userdiff.h" =20 -static char blame_usage[] =3D "git blame [options] [rev-opts] [rev] [-= -] file"; +static char blame_usage[] =3D N_("git blame [options] [rev-opts] [rev]= [--] file"); =20 static const char *blame_opt_usage[] =3D { blame_usage, "", - "[rev-opts] are documented in git-rev-list(1)", + N_("[rev-opts] are documented in git-rev-list(1)"), NULL }; =20 @@ -2296,27 +2296,27 @@ int cmd_blame(int argc, const char **argv, cons= t char *prefix) static const char *revs_file =3D NULL; static const char *contents_from =3D NULL; static const struct option options[] =3D { - OPT_BOOLEAN(0, "incremental", &incremental, "Show blame entries as w= e find them, incrementally"), - OPT_BOOLEAN('b', NULL, &blank_boundary, "Show blank SHA-1 for bounda= ry commits (Default: off)"), - OPT_BOOLEAN(0, "root", &show_root, "Do not treat root commits as bou= ndaries (Default: off)"), - OPT_BOOLEAN(0, "show-stats", &show_stats, "Show work cost statistics= "), - OPT_BIT(0, "score-debug", &output_option, "Show output score for bla= me entries", OUTPUT_SHOW_SCORE), - OPT_BIT('f', "show-name", &output_option, "Show original filename (D= efault: auto)", OUTPUT_SHOW_NAME), - OPT_BIT('n', "show-number", &output_option, "Show original linenumbe= r (Default: off)", OUTPUT_SHOW_NUMBER), - OPT_BIT('p', "porcelain", &output_option, "Show in a format designed= for machine consumption", OUTPUT_PORCELAIN), - OPT_BIT(0, "line-porcelain", &output_option, "Show porcelain format = with per-line commit information", OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELA= IN), - OPT_BIT('c', NULL, &output_option, "Use the same output mode as git-= annotate (Default: off)", OUTPUT_ANNOTATE_COMPAT), - OPT_BIT('t', NULL, &output_option, "Show raw timestamp (Default: off= )", OUTPUT_RAW_TIMESTAMP), - OPT_BIT('l', NULL, &output_option, "Show long commit SHA1 (Default: = off)", OUTPUT_LONG_OBJECT_NAME), - OPT_BIT('s', NULL, &output_option, "Suppress author name and timesta= mp (Default: off)", OUTPUT_NO_AUTHOR), - OPT_BIT('e', "show-email", &output_option, "Show author email instea= d of name (Default: off)", OUTPUT_SHOW_EMAIL), - OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_I= GNORE_WHITESPACE), - OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better = match", XDF_NEED_MINIMAL), - OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from = instead of calling git-rev-list"), - OPT_STRING(0, "contents", &contents_from, "file", "Use 's cont= ents as the final image"), - { OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies withi= n and across files", PARSE_OPT_OPTARG, blame_copy_callback }, - { OPTION_CALLBACK, 'M', NULL, &opt, "score", "Find line movements wi= thin and across files", PARSE_OPT_OPTARG, blame_move_callback }, - OPT_CALLBACK('L', NULL, &bottomtop, "n,m", "Process only line range = n,m, counting from 1", blame_bottomtop_callback), + OPT_BOOLEAN(0, "incremental", &incremental, N_("Show blame entries a= s we find them, incrementally")), + OPT_BOOLEAN('b', NULL, &blank_boundary, N_("Show blank SHA-1 for bou= ndary commits (Default: off)")), + OPT_BOOLEAN(0, "root", &show_root, N_("Do not treat root commits as = boundaries (Default: off)")), + OPT_BOOLEAN(0, "show-stats", &show_stats, N_("Show work cost statist= ics")), + OPT_BIT(0, "score-debug", &output_option, N_("Show output score for = blame entries"), OUTPUT_SHOW_SCORE), + OPT_BIT('f', "show-name", &output_option, N_("Show original filename= (Default: auto)"), OUTPUT_SHOW_NAME), + OPT_BIT('n', "show-number", &output_option, N_("Show original linenu= mber (Default: off)"), OUTPUT_SHOW_NUMBER), + OPT_BIT('p', "porcelain", &output_option, N_("Show in a format desig= ned for machine consumption"), OUTPUT_PORCELAIN), + OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain form= at with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_POR= CELAIN), + OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as g= it-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT), + OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: = off)"), OUTPUT_RAW_TIMESTAMP), + OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Defaul= t: off)"), OUTPUT_LONG_OBJECT_NAME), + OPT_BIT('s', NULL, &output_option, N_("Suppress author name and time= stamp (Default: off)"), OUTPUT_NO_AUTHOR), + OPT_BIT('e', "show-email", &output_option, N_("Show author email ins= tead of name (Default: off)"), OUTPUT_SHOW_EMAIL), + OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), X= DF_IGNORE_WHITESPACE), + OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find bett= er match"), XDF_NEED_MINIMAL), + OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from= instead of calling git-rev-list")), + OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use = 's contents as the final image")), + { OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copie= s within and across files"), PARSE_OPT_OPTARG, blame_copy_callback }, + { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movem= ents within and across files"), PARSE_OPT_OPTARG, blame_move_callback }= , + OPT_CALLBACK('L', NULL, &bottomtop, N_("n,m"), N_("Process only line= range n,m, counting from 1"), blame_bottomtop_callback), OPT__ABBREV(&abbrev), OPT_END() }; --=20 1.7.10.2.549.g9354186