From patchwork Mon Nov  5 19:20:51 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Duy Nguyen <pclouds@gmail.com>
X-Patchwork-Id: 10669013
Return-Path: <git-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4560815A6
	for <patchwork-git@patchwork.kernel.org>;
 Mon,  5 Nov 2018 19:21:23 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38A5D29C9B
	for <patchwork-git@patchwork.kernel.org>;
 Mon,  5 Nov 2018 19:21:23 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 2D51929CD1; Mon,  5 Nov 2018 19:21:23 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI
	autolearn=ham version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A98A629CB5
	for <patchwork-git@patchwork.kernel.org>;
 Mon,  5 Nov 2018 19:21:22 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2388018AbeKFEm2 (ORCPT
        <rfc822;patchwork-git@patchwork.kernel.org>);
        Mon, 5 Nov 2018 23:42:28 -0500
Received: from mail-lj1-f193.google.com ([209.85.208.193]:35409 "EHLO
        mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2387962AbeKFEm1 (ORCPT <rfc822;git@vger.kernel.org>);
        Mon, 5 Nov 2018 23:42:27 -0500
Received: by mail-lj1-f193.google.com with SMTP id x85-v6so9146113ljb.2
        for <git@vger.kernel.org>; Mon, 05 Nov 2018 11:21:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20161025;
        h=from:to:cc:subject:date:message-id:in-reply-to:references
         :mime-version:content-transfer-encoding;
        bh=e7yB6NC6mYec9WbpnahjiDZzCEhKwkHF2g4POrI8edQ=;
        b=SYx7I/eiUkO+9Hulvx4Dtr2ZQkdq6Nwa3qotmdg5AJVN2iWBEERuyIpM03VANSIjIA
         RJ01l54/zi/QnrxS/4+aZJhcuRWeoUV/ZW9H9YYOphjBoep5uhNQL0l1ApkTEzS65G9p
         ukiFTUS7d4mFoZWmLW6E32zZxlYqMFyyZLYCVsnuxNDqxWEawvNeUQJs+qK2ZTZ7urqa
         ImCTpIMWyvhGJWrPezuouQ35Rt+TP9ZjBxkL63WBuK+0oCgLpKtAofbMhiwWLZLB4bDV
         0jZhnFv24o9qbx0QFyubkuHxJxqRxIj7osxqq8V5HjHevYavTSNepZV1RS28DLBJCjZy
         OOkQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
         :references:mime-version:content-transfer-encoding;
        bh=e7yB6NC6mYec9WbpnahjiDZzCEhKwkHF2g4POrI8edQ=;
        b=J6DM7WwPu2AdIKsQNM2sFKOVT8LkWhq1hdf1K09YwfLLtvtKK+m9stBNihB4TRr4UI
         OjvrCWZdUsJ58alVBBfzhTrYJ6omOAO4/BqOBuoU+CDTNE6N4aCnTp7dx9xesyNOSCn2
         Q7bY7C9DVdLFhk+YyeNSsNITxvGxDK0BzxFBEHcw3vc/WhuzbmtOZJYUXKq1G/VvotVP
         NyYUI80QWKlTCYugI0/g2a+PBRSq62Z5qAalFmr5vF1VS9pxdn32qH3a11LmdO6b1JUR
         PUWsG+vK1ig2g7z2XZBhMUqrKLDMYGzbs8algv5rnxEVe+vLAMHwLpSODU7BQGM3+hDL
         gV9w==
X-Gm-Message-State: AGRZ1gIPEBs92GvoIg8o+e2Oc/CHl77dqS4SSmYJU7gNQf4MDy5AnInK
        dOR2/cCc0CAf4YSONUsnXrz6Emcx
X-Google-Smtp-Source: 
 AJdET5cE4+c/Hl67z5dfGnztYh5rQkrAj67npYdwmDamB3/aa5sHXRhkTpqz3JHV5KUBjYPaaR873g==
X-Received: by 2002:a2e:2166:: with SMTP id
 h99-v6mr4050204ljh.53.1541445677108;
        Mon, 05 Nov 2018 11:21:17 -0800 (PST)
Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se.
 [80.216.12.205])
        by smtp.gmail.com with ESMTPSA id
 x5-v6sm3591056lfe.58.2018.11.05.11.21.16
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Mon, 05 Nov 2018 11:21:16 -0800 (PST)
From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>, =?utf-8?q?SZEDE?=
	=?utf-8?q?R_G=C3=A1bor?= <szeder.dev@gmail.com>
Subject: [PATCH v2 08/16] reflog: mark strings for translation
Date: Mon,  5 Nov 2018 20:20:51 +0100
Message-Id: <20181105192059.20303-9-pclouds@gmail.com>
X-Mailer: git-send-email 2.19.1.1005.gac84295441
In-Reply-To: <20181105192059.20303-1-pclouds@gmail.com>
References: <20181028065157.26727-1-pclouds@gmail.com>
 <20181105192059.20303-1-pclouds@gmail.com>
MIME-Version: 1.0
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

One string "nothing to delete?" is rephrased to be more helpful.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/reflog.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index b5941c1ff3..5a74ccf7ab 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -13,11 +13,15 @@
 
 /* NEEDSWORK: switch to using parse_options */
 static const char reflog_expire_usage[] =
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <refs>...";
+N_("git reflog expire [--expire=<time>] "
+   "[--expire-unreachable=<time>] "
+   "[--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] "
+   "[--verbose] [--all] <refs>...");
 static const char reflog_delete_usage[] =
-"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <refs>...";
+N_("git reflog delete [--rewrite] [--updateref] "
+   "[--dry-run | -n] [--verbose] <refs>...");
 static const char reflog_exists_usage[] =
-"git reflog exists <ref>";
+N_("git reflog exists <ref>");
 
 static timestamp_t default_reflog_expire;
 static timestamp_t default_reflog_expire_unreachable;
@@ -556,7 +560,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 			break;
 		}
 		else if (arg[0] == '-')
-			usage(reflog_expire_usage);
+			usage(_(reflog_expire_usage));
 		else
 			break;
 	}
@@ -569,7 +573,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 	if (cb.cmd.stalefix) {
 		repo_init_revisions(the_repository, &cb.cmd.revs, prefix);
 		if (flags & EXPIRE_REFLOGS_VERBOSE)
-			printf("Marking reachable objects...");
+			printf(_("Marking reachable objects..."));
 		mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
 		if (flags & EXPIRE_REFLOGS_VERBOSE)
 			putchar('\n');
@@ -598,7 +602,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		char *ref;
 		struct object_id oid;
 		if (!dwim_log(argv[i], strlen(argv[i]), &oid, &ref)) {
-			status |= error("%s points nowhere!", argv[i]);
+			status |= error(_("%s points nowhere!"), argv[i]);
 			continue;
 		}
 		set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
@@ -644,13 +648,13 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 			break;
 		}
 		else if (arg[0] == '-')
-			usage(reflog_delete_usage);
+			usage(_(reflog_delete_usage));
 		else
 			break;
 	}
 
 	if (argc - i < 1)
-		return error("Nothing to delete?");
+		return error(_("no reflog specified to delete"));
 
 	for ( ; i < argc; i++) {
 		const char *spec = strstr(argv[i], "@{");
@@ -659,12 +663,12 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 		int recno;
 
 		if (!spec) {
-			status |= error("Not a reflog: %s", argv[i]);
+			status |= error(_("not a reflog: %s"), argv[i]);
 			continue;
 		}
 
 		if (!dwim_log(argv[i], spec - argv[i], &oid, &ref)) {
-			status |= error("no reflog for '%s'", argv[i]);
+			status |= error(_("no reflog for '%s'"), argv[i]);
 			continue;
 		}
 
@@ -699,7 +703,7 @@ static int cmd_reflog_exists(int argc, const char **argv, const char *prefix)
 			break;
 		}
 		else if (arg[0] == '-')
-			usage(reflog_exists_usage);
+			usage(_(reflog_exists_usage));
 		else
 			break;
 	}
@@ -707,10 +711,10 @@ static int cmd_reflog_exists(int argc, const char **argv, const char *prefix)
 	start = i;
 
 	if (argc - start != 1)
-		usage(reflog_exists_usage);
+		usage(_(reflog_exists_usage));
 
 	if (check_refname_format(argv[start], REFNAME_ALLOW_ONELEVEL))
-		die("invalid ref format: %s", argv[start]);
+		die(_("invalid ref format: %s"), argv[start]);
 	return !reflog_exists(argv[start]);
 }
 
@@ -719,12 +723,12 @@ static int cmd_reflog_exists(int argc, const char **argv, const char *prefix)
  */
 
 static const char reflog_usage[] =
-"git reflog [ show | expire | delete | exists ]";
+N_("git reflog [ show | expire | delete | exists ]");
 
 int cmd_reflog(int argc, const char **argv, const char *prefix)
 {
 	if (argc > 1 && !strcmp(argv[1], "-h"))
-		usage(reflog_usage);
+		usage(_(reflog_usage));
 
 	/* With no command, we default to showing it. */
 	if (argc < 2 || *argv[1] == '-')