All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alangi Derick <alangiderick@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Subject: [PATCH] Fixed a translation error(die(_()) function)
Date: Sun, 3 May 2015 19:30:13 +0100	[thread overview]
Message-ID: <554767a4.e3f3c20a.2d59.ffffb953@mx.google.com> (raw)

Signed-off-by: Alangi Derick <alangiderick@gmail.com>
---
 advice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/advice.c b/advice.c
index 575bec2..a8b2909 100644
--- a/advice.c
+++ b/advice.c
@@ -93,7 +93,7 @@ int error_resolve_conflict(const char *me)
 void NORETURN die_resolve_conflict(const char *me)
 {
 	error_resolve_conflict(me);
-	die("Exiting because of an unresolved conflict.");
+	die(_("Exiting because of an unresolved conflict."));
 }
 
 void detach_advice(const char *new_name)
-- 
2.4.0

                 reply	other threads:[~2015-05-04 12:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=554767a4.e3f3c20a.2d59.ffffb953@mx.google.com \
    --to=alangiderick@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.