fdisk: untangle the reporting of deprecated mode and unit

Translatable messages should not be split into parts that are
conditionally concatenated.  Preferably they should each form
a complete message.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 0126e67b566b022f6837120dc643a838e3b31f6a..8f48a61af13dad4984b4568a159c8e0d4db443b3 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -796,18 +796,12 @@ warn_alignment(void) {
 "the physical sector size. Aligning to a physical sector (or optimal\n"
 "I/O) size boundary is recommended, or performance may be impacted.\n"));
 
-       if (dos_compatible_flag) {
+       if (dos_compatible_flag)
                fprintf(stderr, _("\n"
 "WARNING: DOS-compatible mode is deprecated. It's strongly recommended to\n"
-"         switch off the mode (command 'c')"));
-
-               if (display_in_cyl_units)
-                       fprintf(stderr, _(" and change display units to\n"
-"         sectors (command 'u').\n"));
-               else
-                       fprintf(stderr, ".\n");
+"         switch off the mode (with command 'c')."));
 
-        } else if (display_in_cyl_units)
+       if (display_in_cyl_units)
                fprintf(stderr, _("\n"
 "WARNING: cylinders as display units are deprecated. Use command 'u' to\n"
 "         change units to sectors.\n"));