more small textual fixes
Subsystems (2)
PATCH 1/1 more small textual fixes
Hi,
Another spattering of light patches: angular brackets, spelling, wording, grammar, punctuation. The fourth patch tags a translator comment, so it will get included in the POT file. The fifth patch improves two messages that have already been changed (typo-corrected) since rc1.
Regards,
Benno
Signature · 1 line
http://www.fastmail.fm - A no graphics, no pop-ups email service
From b42a5720330fc8df4953df47c585de5ae25de33c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Thu, 3 Oct 2013 21:34:54 +0200
Subject: [PATCH 1/7] textual: use the standard angular brackets for non-literal arguments
--- fdisks/cfdisk.c | 2 +- text-utils/hexsyntax.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fdisks/cfdisk.c +1 -1
@@ -2760,7 +2760,7 @@ copyright(void) {static void __attribute__ ((__noreturn__))usage (FILE *out) {fputs (USAGE_HEADER , out); -fprintf (out,_ (" %s [options] device\n" ), program_invocation_short_name); +fprintf (out,_ (" %s [options] <device>\n" ), program_invocation_short_name);fputs (USAGE_OPTIONS , out);fputs (_ (" -c, --cylinders <number> set the number of cylinders to use\n" ), out);fputs (_ (" -h, --heads <number> set the number of heads to use\n" ), out);
text-utils/hexsyntax.c +1 -1
@@ -139,7 +139,7 @@ newsyntax(int argc, char ***argvp)void __attribute__((__noreturn__))usage (FILE *out) {fputs (USAGE_HEADER , out); -fprintf (out,_ (" %s [options] file...\n" ), program_invocation_short_name); +fprintf (out,_ (" %s [options] <file>...\n" ), program_invocation_short_name);fputs (USAGE_OPTIONS , out);fputs (_ (" -b, --one-byte-octal one-byte octal display\n" ), out);fputs (_ (" -c, --one-byte-char one-byte character display\n" ), out);
Signature · 1 line
1.7.0.4
From 7700f5b980ef3311e0489947705450d7eee3fc40 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Thu, 3 Oct 2013 21:40:04 +0200
Subject: [PATCH 2/7] textual: change spelling of "disk label" to the more abundant "disklabel"
--- fdisks/fdisk-menu.c | 6 +++--- fdisks/fdisk.c | 2 +- libfdisk/src/bsd.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
fdisks/fdisk-menu.c +3 -3
@@ -413,7 +413,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,case 'w' : rc =fdisk_write_disklabel (cxt);if (rc) -err (EXIT_FAILURE ,_ ("failed to write disk label" )); +err (EXIT_FAILURE ,_ ("failed to write disklabel" ));if (cxt->parent)break ;/* nested PT, don't leave */ fdisk_info (cxt,_ ("The partition table has been altered." ));
@@ -486,7 +486,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,if (cxt->parent) { *cxt0 = cxt->parent; -fdisk_info (cxt,_ ("Leaving nested disk label." )); +fdisk_info (cxt,_ ("Leaving nested disklabel." ));fdisk_free_context (cxt); cxt = *cxt0; }
@@ -569,7 +569,7 @@ static int dos_menu_cb(struct fdisk_context **cxt0,fdisk_free_context (bsd); else { *cxt0 = cxt = bsd; -fdisk_info (cxt,_ ("Entering to nested BSD disk label" )); +fdisk_info (cxt,_ ("Entering nested BSD disklabel" )); }break ; }
fdisks/fdisk.c +1 -1
@@ -220,7 +220,7 @@ void list_disk_geometry(struct fdisk_context *cxt)fdisk_colon (cxt,_ ("Alignment offset: %lu bytes" ), cxt->alignment_offset);if (fdisk_dev_has_disklabel (cxt)) -fdisk_colon (cxt,_ ("Disk label type: %s" ), cxt->label->name); +fdisk_colon (cxt,_ ("Disklabel type: %s" ), cxt->label->name);if (fdisk_get_disklabel_id (cxt, &id) ==0 && id)fdisk_colon (cxt,_ ("Disk identifier: %s" ), id);
libfdisk/src/bsd.c +1 -1
@@ -576,7 +576,7 @@ int fdisk_bsd_write_bootstrap(struct fdisk_context *cxt)for (p = dp; p < dp +sizeof (struct bsd_disklabel ); p++) {if (!*p)continue ; -fdisk_warnx (cxt,_ ("Bootstrap overlaps with disk label!" )); +fdisk_warnx (cxt,_ ("Bootstrap overlaps with disklabel!" ));return -EINVAL ; }
Signature · 1 line
1.7.0.4
From 7c30ba5c0533f6c7b6f56a5ef376010aa032dcc7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Thu, 3 Oct 2013 21:57:03 +0200
Subject: [PATCH 3/7] textual: use consistent wording and punctuation in fdisk stuff
--- fdisks/fdisk-menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
fdisks/fdisk-menu.c +3 -3
@@ -161,7 +161,7 @@ struct menu menu_sun = { .label = FDISK_DISKLABEL_SUN, .entries = {MENU_BSEP (N_ ("Sun" )), -MENU_ENT ('a' ,N_ ("toggle a read only flag" )), +MENU_ENT ('a' ,N_ ("toggle the read-only flag" )),MENU_ENT ('c' ,N_ ("toggle the mountable flag" )), MENU_XENT('a', N_("change number of alternate cylinders")),
@@ -458,7 +458,7 @@ static int generic_menu_cb(struct fdisk_context **cxt0,if (rc)fdisk_warnx (cxt,_ ("Could not delete partition %d" ), n +1 );else -fdisk_info (cxt,_ ("Partition %d is deleted" ), n +1 ); +fdisk_info (cxt,_ ("Partition %d has been deleted." ), n +1 );break ;case 'l' :list_partition_types (cxt);
@@ -569,7 +569,7 @@ static int dos_menu_cb(struct fdisk_context **cxt0,fdisk_free_context (bsd); else { *cxt0 = cxt = bsd; -fdisk_info (cxt,_ ("Entering nested BSD disklabel" )); +fdisk_info (cxt,_ ("Entering nested BSD disklabel." )); }break ; }
Signature · 1 line
1.7.0.4
From c0cfd68cf46b30faff78bff04ea4b22ea675637b Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Thu, 3 Oct 2013 23:03:28 +0200
Subject: [PATCH 4/7] textual: tag a translator comment and put it in proper place
--- misc-utils/cal.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
misc-utils/cal.c +4 -6
@@ -456,12 +456,6 @@ static int do_monthly(int day, int month, long year,day_array (day, month, year, days); -/* -* %s is the month name, %d the year number. -* you can change the order and/or add something here; eg for -* Basque the translation should be: "%2$dko %1$s", and -* the Vietnamese should be "%s na(m %d", etc. -*/ if (header_hint <0 ) header_hint =two_header_lines (month, year);if (header_hint) {
@@ -472,6 +466,10 @@ static int do_monthly(int day, int month, long year,center_str (lineout, out->s[pos],ARRAY_SIZE (out->s[pos]), width); pos++; }else { +/* TRANSLATORS: %s is the month name, %ld the year number. +* You can change the order and/or add something here; +* e.g. for Basque the translation should be "%2$ldko %1$s", +* and the Vietnamese should be "%s năm %d", and so on. */ snprintf (lineout,sizeof (lineout),_ ("%s %ld" ), full_month[month -1 ], year);center_str (lineout, out->s[pos],ARRAY_SIZE (out->s[pos]), width);
Signature · 1 line
1.7.0.4
From 1c083f840488c03658a981e9876b91e8d3b05820 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Fri, 4 Oct 2013 21:22:53 +0200
Subject: [PATCH 5/7] textual: make two messages somewhat easier to understand
--- term-utils/agetty.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
term-utils/agetty.c +2 -2
@@ -667,7 +667,7 @@ static void parse_args(int argc, char **argv, struct options *op)else if (strcmp (optarg,"=auto" ) ==0 ) op->clocal =CLOCAL_MODE_AUTO ;else -log_err (_ ("unsupported --local-line mode argument" )); +log_err (_ ("invalid argument of --local-line" )); }break ;case 'm' :
@@ -1807,7 +1807,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out)fputs (_ (" -i, --noissue do not display issue file\n" ), out);fputs (_ (" -I, --init-string <string> set init string\n" ), out);fputs (_ (" -l, --login-program <file> specify login program\n" ), out); -fputs (_ (" -L, --local-line[=<mode>] control local line flag\n" ), out); +fputs (_ (" -L, --local-line[=<mode>] control the local line flag\n" ), out);fputs (_ (" -m, --extract-baud extract baud rate during connect\n" ), out);fputs (_ (" -n, --skip-login do not prompt for login\n" ), out);fputs (_ (" -o, --login-options <opts> options that are passed to login\n" ), out);
Signature · 1 line
1.7.0.4
From ef5152fb7d077e771eee52eeb8a6f10407784ff4 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Sat, 5 Oct 2013 18:00:24 +0200
Subject: [PATCH 6/7] COPYING: fix grammar of referring phrase, and indicate location better
--- README.licensing | 2 +- libblkid/COPYING | 4 ++-- libfdisk/COPYING | 4 ++-- libmount/COPYING | 4 ++-- libuuid/COPYING | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
README.licensing +1 -1
@@ -15,6 +15,6 @@ There is code under: Please, check the source code for more details. A license is usually at the start of each source file. -The /COPYING file (GPLv2+) is the default license for code without an explicitly +The ./COPYING file (GPLv2+) is the default license for code without an explicitly defined license.
libblkid/COPYING +2 -2
@@ -4,5 +4,5 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -The complete text of the license is available at the -Documentation/licenses/COPYING.LGPLv2.1 file. +The complete text of the license is available in the +../Documentation/licenses/COPYING.LGPLv2.1 file.
libfdisk/COPYING +2 -2
@@ -4,5 +4,5 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -The complete text of the license is available at the -Documentation/licenses/COPYING.LGPLv2.1 file. +The complete text of the license is available in the +../Documentation/licenses/COPYING.LGPLv2.1 file.
libmount/COPYING +2 -2
@@ -4,5 +4,5 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. -The complete text of the license is available at the -Documentation/licenses/COPYING.LGPLv2.1 file. +The complete text of the license is available in the +../Documentation/licenses/COPYING.LGPLv2.1 file.
libuuid/COPYING +2 -2
@@ -1,5 +1,5 @@ This library is free software; you can redistribute it and/or modify it under the terms of the Modified BSD License. -The complete text of the license is available at the -Documentation/licenses/COPYING.BSD-3 file. +The complete text of the license is available in the +../Documentation/licenses/COPYING.BSD-3 file.
Signature · 1 line
1.7.0.4
From 363dacc3521eb236a635ffe3936968b463f2face Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <[email protected]>
Date: Sat, 5 Oct 2013 18:08:59 +0200
Subject: [PATCH 7/7] docs: improve grammar and wording of the release-schedule text
--- Documentation/release-schedule.txt | 45 ++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 22 deletions(-)
Documentation/release-schedule.txt +23 -22
60 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Quoted 4 lines · Benno Schulenberg
Another spattering of light patches: angular brackets, spelling, wording, grammar, punctuation. The fourth patch tags a translator comment, so it will get included in the POT file. The fifth patch improves two messages that have already been changed (typo-corrected) since rc1.
Applied, thanks.
Signature · 2 lines
Karel Zak <[email protected]> http://karelzak.blogspot.com