From 4911d2bc4f380001faf6707e3004be15e6b67a72 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 14 Jun 2010 20:08:50 +0200 Subject: [PATCH] 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 Signed-off-by: Karel Zak --- fdisk/fdisk.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c index 0126e67b..8f48a61a 100644 --- 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")); -- 2.39.5