From 4ab7b16b9573bdfa32279e4adadff684d5cd58ac Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Sat, 12 Sep 2009 14:07:36 +0300 Subject: A few grammar fixes. Thanks to Christian Weisgerber for pointing out some of these. --- src/xz/message.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/xz/message.c') diff --git a/src/xz/message.c b/src/xz/message.c index 19aff9bd..0a01bc45 100644 --- a/src/xz/message.c +++ b/src/xz/message.c @@ -361,14 +361,14 @@ progress_sizes_helper(char **pos, size_t *left, uint64_t value, bool final) // Allow high precision only for the final message, since it looks // stupid for in-progress information. if (final) { - // At maximum of four digits is allowed for exact byte count. + // A maximum of four digits are allowed for exact byte count. if (value < 10000) { my_snprintf(pos, left, "%s B", uint64_to_str(value, 0)); return; } - // At maximum of five significant digits is allowed for KiB. + // A maximum of five significant digits are allowed for KiB. if (value < UINT64_C(10239900)) { my_snprintf(pos, left, "%s KiB", double_to_str( (double)(value) / 1024.0)); @@ -523,51 +523,51 @@ progress_remaining(uint64_t in_pos, uint64_t elapsed) // Select appropriate precision for the estimated remaining time. if (remaining <= 10) { - // At maximum of 10 seconds remaining. + // A maximum of 10 seconds remaining. // Show the number of seconds as is. snprintf(buf, sizeof(buf), "%" PRIu32 " s", remaining); } else if (remaining <= 50) { - // At maximum of 50 seconds remaining. + // A maximum of 50 seconds remaining. // Round up to the next multiple of five seconds. remaining = (remaining + 4) / 5 * 5; snprintf(buf, sizeof(buf), "%" PRIu32 " s", remaining); } else if (remaining <= 590) { - // At maximum of 9 minutes and 50 seconds remaining. + // A maximum of 9 minutes and 50 seconds remaining. // Round up to the next multiple of ten seconds. remaining = (remaining + 9) / 10 * 10; snprintf(buf, sizeof(buf), "%" PRIu32 " min %" PRIu32 " s", remaining / 60, remaining % 60); } else if (remaining <= 59 * 60) { - // At maximum of 59 minutes remaining. + // A maximum of 59 minutes remaining. // Round up to the next multiple of a minute. remaining = (remaining + 59) / 60; snprintf(buf, sizeof(buf), "%" PRIu32 " min", remaining); } else if (remaining <= 9 * 3600 + 50 * 60) { - // At maximum of 9 hours and 50 minutes left. + // A maximum of 9 hours and 50 minutes left. // Round up to the next multiple of ten minutes. remaining = (remaining + 599) / 600 * 10; snprintf(buf, sizeof(buf), "%" PRIu32 " h %" PRIu32 " min", remaining / 60, remaining % 60); } else if (remaining <= 23 * 3600) { - // At maximum of 23 hours remaining. + // A maximum of 23 hours remaining. // Round up to the next multiple of an hour. remaining = (remaining + 3599) / 3600; snprintf(buf, sizeof(buf), "%" PRIu32 " h", remaining); } else if (remaining <= 9 * 24 * 3600 + 23 * 3600) { - // At maximum of 9 days and 23 hours remaining. + // A maximum of 9 days and 23 hours remaining. // Round up to the next multiple of an hour. remaining = (remaining + 3599) / 3600; snprintf(buf, sizeof(buf), "%" PRIu32 " d %" PRIu32 " h", remaining / 24, remaining % 24); } else if (remaining <= 999 * 24 * 3600) { - // At maximum of 999 days remaining. ;-) + // A maximum of 999 days remaining. ;-) // Round up to the next multiple of a day. remaining = (remaining + 24 * 3600 - 1) / (24 * 3600); snprintf(buf, sizeof(buf), "%" PRIu32 " d", remaining); @@ -1157,7 +1157,7 @@ message_help(bool long_help) if (long_help) { printf(_( -"On this system and configuration, this program will use at maximum of roughly\n" +"On this system and configuration, this program will use a maximum of roughly\n" "%s MiB RAM and "), uint64_to_str(hardware_memlimit_get() / (1024 * 1024), 0)); printf(N_("one thread.\n\n", "%s threads.\n\n", hardware_threadlimit_get()), -- cgit v1.2.3