From: Eric Sandeen <sandeen@sandeen.net>
Date: Thu, 4 Feb 2016 21:42:15 +0000 (+1100)
Subject: xfs_repair: Fix untranslatable strings
X-Git-Tag: v4.5.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=add8ff67a250c81882f18635b5fc1ee75ccb7c62;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: Fix untranslatable strings

Don't substitute in "would" or "will" for %s here, it makes
it untranslatable.  Just spell it out twice like every other
message in the function.

Reported-by: Jakub Bogusz <qboosh@pld-linux.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/repair/versions.c b/repair/versions.c
index 158538513..978f48b84 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -224,10 +224,17 @@ _("WARNING:  you have disallowed attr2 attributes but this filesystem\n"
 	}
 
 	if (!(sb->sb_versionnum & XFS_SB_VERSION_NLINKBIT)) {
-		do_warn(
-_("WARNING: you have a V1 inode filesystem. It %s be converted to a\n"
+		if (!no_modify) {
+			do_warn(
+_("WARNING: you have a V1 inode filesystem. It will be converted to a\n"
   "\tversion 2 inode filesystem. If you do not want this, run an older\n"
-  "\tversion of xfs_repair.\n"), no_modify ? "would" : "will");
+  "\tversion of xfs_repair.\n"));
+		} else  {
+			do_warn(
+_("WARNING: you have a V1 inode filesystem. It would be converted to a\n"
+  "\tversion 2 inode filesystem. If you do not want this, run an older\n"
+  "\tversion of xfs_repair.\n"));
+		}
 	}
 
 	if (xfs_sb_version_hasquota(sb))  {