linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Benno Schulenberg <bensberg@justemail.net>
To: linux-ext4@vger.kernel.org
Subject: [2/4 v2] e2fsck: make a prompt message simpler and thus translatable
Date: Tue,  3 Jun 2014 22:35:22 +0200	[thread overview]
Message-ID: <1401827722-13286-1-git-send-email-bensberg@justemail.net> (raw)
In-Reply-To: <20140602234001.GJ30598@thunk.org>

It can be made simpler because there is no need to differentiate between
having an internal journal inode and having an external journal device.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

---
 e2fsck/journal.c |    1 -
 e2fsck/problem.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/e2fsck/journal.c b/e2fsck/journal.c
index a7b1150..a3b3967 100644
--- a/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@ -820,7 +820,6 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx)
 no_has_journal:
 	if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
 		recover = sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER;
-		pctx.str = "inode";
 		if (fix_problem(ctx, PR_0_JOURNAL_HAS_JOURNAL, &pctx)) {
 			if (recover &&
 			    !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx))
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 2b564a8..e393417 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -225,7 +225,7 @@ static struct e2fsck_problem problem_table[] = {
 
 	/* Superblock has_journal flag is clear but has a journal */
 	{ PR_0_JOURNAL_HAS_JOURNAL,
-	  N_("@S has_@j flag is clear, but a @j %s is present.\n"),
+	  N_("@S has_@j flag is clear, but a @j is present.\n"),
 	  PROMPT_CLEAR, PR_PREEN_OK },
 
 	/* Superblock needs_recovery flag is set but not journal is present */

  reply	other threads:[~2014-06-03 20:35 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-02 19:48 [PATCH 1/4] po: describe more precisely the %B expansion Benno Schulenberg
2014-06-02 19:48 ` [PATCH 2/4] e2fsck: make a prompt message translatable by not using fill-in words Benno Schulenberg
2014-06-02 23:40   ` Theodore Ts'o
2014-06-03 20:35     ` Benno Schulenberg [this message]
2014-06-04  2:07       ` [2/4 v2] e2fsck: make a prompt message simpler and thus translatable Theodore Ts'o
2014-06-04 12:23         ` Benno Schulenberg
2014-06-04 12:56           ` Theodore Ts'o
2014-06-04 13:25             ` Benno Schulenberg
2014-06-04 14:42               ` Theodore Ts'o
2014-06-04 15:38                 ` Benno Schulenberg
2014-06-04 16:03                   ` Theodore Ts'o
2014-06-02 19:48 ` [PATCH 3/4] e2fsck: make two comments match the messages Benno Schulenberg
2014-06-04  2:07   ` Theodore Ts'o
2014-06-02 19:48 ` [PATCH 4/4] e2fsck: sort the abbreviations better Benno Schulenberg
2014-06-04  2:07   ` Theodore Ts'o
2014-06-04  2:05 ` [PATCH 1/4] po: describe more precisely the %B expansion Theodore Ts'o

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=1401827722-13286-1-git-send-email-bensberg@justemail.net \
    --to=bensberg@justemail.net \
    --cc=linux-ext4@vger.kernel.org \
    /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).