[PATCH] fully and properly gettextize two error messages in e2fsck

[Benno Schulenberg <bensberg@justemail.net>]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]


It is better to gettextize entire sentences, and not synthesize
them from fragments, so the grammar can be kept correct in
translations.

-- 
http://www.fastmail.fm - The way an email service should be


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0010-e2fsck-fully-and-properly-gettextize-two-error-messa.patch --]
[-- Type: text/x-diff; name="0010-e2fsck-fully-and-properly-gettextize-two-error-messa.patch", Size: 1689 bytes --]

From f11ab73d16063132b434b018dc31fc39fa2cd678 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 1 Jun 2014 19:08:22 +0200
Subject: [PATCH 10/14] e2fsck: fully and properly gettextize two error messages

The phrases "mounted" and "in use" were filled in untranslated into
the messages.  But it is better to gettextize entire sentences, and
not synthesize them from fragments.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 e2fsck/unix.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 2267a02..428c8fb 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -249,15 +249,19 @@ static void check_mount(e2fsck_t ctx)
 	     ((ctx->options & E2F_OPT_FORCE) &&
 	      (ctx->mount_flags & EXT2_MF_READONLY))) &&
 	    !(ctx->options & E2F_OPT_WRITECHECK)) {
-		log_out(ctx, _("Warning!  %s is %s.\n"),
-			ctx->filesystem_name,
-			ctx->mount_flags & EXT2_MF_MOUNTED ?
-				"mounted" : "in use");
+		if (ctx->mount_flags & EXT2_MF_MOUNTED)
+			log_out(ctx, _("Warning!  %s is mounted.\n"),
+					ctx->filesystem_name);
+		else
+			log_out(ctx, _("Warning!  %s is in use.\n"),
+					ctx->filesystem_name);
 		return;
 	}
 
-	log_out(ctx, _("%s is %s.\n"), ctx->filesystem_name,
-		ctx->mount_flags & EXT2_MF_MOUNTED ? "mounted" : "in use");
+	if (ctx->mount_flags & EXT2_MF_MOUNTED)
+		log_out(ctx, _("%s is mounted.\n"), ctx->filesystem_name);
+	else
+		log_out(ctx, _("%s is in use.\n"), ctx->filesystem_name);
 	if (!ctx->interactive || ctx->mount_flags & EXT2_MF_BUSY)
 		fatal_error(ctx, _("Cannot continue, aborting.\n\n"));
 	puts("\007\007\007\007");
-- 
1.7.0.4