[PATCH] xfs_repair: Fix untranslatable strings

Eric Sandeen sandeen at sandeen.net
Sun Jan 24 11:08:24 CST 2016


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 at pld-linux.org>
Signed-off-by: Eric Sandeen <sandeen at sandeen.net>
---

diff --git a/repair/versions.c b/repair/versions.c
index 1585385..978f48b 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))  {



More information about the xfs mailing list