summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@justemail.net>2008-08-31 12:35:18 +0200
committerJim Meyering <meyering@redhat.com>2008-09-19 12:27:37 +0200
commitfec05eb377d82682adc98df38530e758889e8226 (patch)
treed5fa78478040dbc5207f89a805df5868abe79bbf /src
parent6d5bf36d5c5e8fcdf1a219d06c9eb8a2ba720850 (diff)
downloadcoreutils-fec05eb377d82682adc98df38530e758889e8226.tar.xz
uptime --help: put together message parts that belong together
Diffstat (limited to 'src')
-rw-r--r--src/uptime.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/uptime.c b/src/uptime.c
index a5c4fe55c..8687a575f 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -130,17 +130,21 @@ print_uptime (size_t n, const STRUCT_UTMP *this)
/* procps' version of uptime also prints the seconds field, but
previous versions of coreutils don't. */
if (tmn)
- fprintftime (stdout, _(" %H:%M%P up "), tmn, 0, 0);
+ /* TRANSLATORS: This prints the current clock time. */
+ fprintftime (stdout, _(" %H:%M%P "), tmn, 0, 0);
else
- printf (_(" ??:???? up "));
+ printf (_(" ??:???? "));
if (uptime == (time_t) -1)
- printf (_("???? days ??:??, "));
+ printf (_("up ???? days ??:??, "));
else
{
if (0 < updays)
- printf (ngettext ("%ld day", "%ld days", select_plural (updays)),
- updays);
- printf (" %2d:%02d, ", uphours, upmins);
+ printf (ngettext ("up %ld day %2d:%02d, ",
+ "up %ld days %2d:%02d, ",
+ select_plural (updays)),
+ updays, uphours, upmins);
+ else
+ printf ("up %2d:%02d, ", uphours, upmins);
}
printf (ngettext ("%lu user", "%lu users", entries),
(unsigned long int) entries);