]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_repair: Fix untranslatable strings
authorEric Sandeen <sandeen@sandeen.net>
Thu, 4 Feb 2016 21:42:15 +0000 (08:42 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 4 Feb 2016 21:42:15 +0000 (08:42 +1100)
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>
repair/versions.c

index 15853851363adfde25c3ddc73eb78caaa66e5bcc..978f48b84f22670f280ac7b2b256054e72f21b5b 100644 (file)
@@ -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))  {