Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit fbae17fa fbae17faded91e5d15bfd495daa5bedd32f340ad by Wojciech Polak
Options

Small NLS improvement

1 parent fa01b9cb
Inline Side-by-side
Showing 3 changed files with 12 additions and 8 deletions
...@@ -403,9 +403,11 @@ cleanup: ...@@ -403,9 +403,11 @@ cleanup:
403 403
404 cleanup1: 404 cleanup1:
405 if (show_summary) 405 if (show_summary)
406 printf (_("You have %d messages\n"), total); 406 printf (total == 1 ? _("You have %d message.\n")
407 : _("You have %d messages.\n"),
408 total);
407 if (show_query && have_new_mail) 409 if (show_query && have_new_mail)
408 printf (_("You have new mail\n")); 410 printf (_("You have new mail.\n"));
409 411
410 /* 0 - selected messages discover. 412 /* 0 - selected messages discover.
411 1 - have messages. 413 1 - have messages.
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2001 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
3 3
4 GNU Mailutils is free software; you can redistribute it and/or modify 4 GNU Mailutils is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
...@@ -47,8 +47,9 @@ mail_mbox_close () ...@@ -47,8 +47,9 @@ mail_mbox_close ()
47 47
48 mailbox_get_url (mbox, &url); 48 mailbox_get_url (mbox, &url);
49 mailbox_messages_count (mbox, &held_count); 49 mailbox_messages_count (mbox, &held_count);
50 fprintf (ofile, _("Held %d messages in %s\n"), held_count, url_to_string (url)); 50 fprintf (ofile, held_count == 1 ? _("Held %d message in %s\n")
51 51 : _("Held %d messages in %s\n"),
52 held_count, url_to_string (url));
52 mailbox_close (mbox); 53 mailbox_close (mbox);
53 mailbox_destroy (&mbox); 54 mailbox_destroy (&mbox);
54 return 0; 55 return 0;
...@@ -124,8 +125,9 @@ mail_mbox_commit () ...@@ -124,8 +125,9 @@ mail_mbox_commit ()
124 url_t u = NULL; 125 url_t u = NULL;
125 126
126 mailbox_get_url (dest_mbox, &u); 127 mailbox_get_url (dest_mbox, &u);
127 fprintf(ofile, _("Saved %d messages in %s\n"), saved_count, 128 fprintf(ofile, saved_count == 1 ? _("Saved %d message in %s\n")
128 url_to_string (u)); 129 : _("Saved %d messages in %s\n"),
130 saved_count, url_to_string (u));
129 mailbox_close (dest_mbox); 131 mailbox_close (dest_mbox);
130 mailbox_destroy (&dest_mbox); 132 mailbox_destroy (&dest_mbox);
131 } 133 }
......
...@@ -63,7 +63,7 @@ mail_summary (int argc, char **argv) ...@@ -63,7 +63,7 @@ mail_summary (int argc, char **argv)
63 mailbox_get_url (mbox, &url); 63 mailbox_get_url (mbox, &url);
64 printf("\"%s\": ", url_to_string (url)); 64 printf("\"%s\": ", url_to_string (url));
65 } 65 }
66 printf (_("%d messages"), count); 66 printf ("%d %s", count, count == 1 ? _("message") : _("messages"));
67 if (mnew > 0) 67 if (mnew > 0)
68 printf (_(" %d new"), mnew); 68 printf (_(" %d new"), mnew);
69 if (mseen > 0) 69 if (mseen > 0)
......