From 496a6b3024901b7124cabbf9ceeca1a0df38dfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sat, 21 Dec 2013 03:03:31 +0100 Subject: [PATCH] Correct some translatable strings. --- ChangeLog | 4 +++ grub-core/commands/file.c | 42 +++++++++++++++--------------- grub-core/commands/verify.c | 4 +-- grub-core/commands/xen/lsxen.c | 4 +-- grub-core/osdep/windows/platform.c | 2 +- util/grub-glue-efi.c | 2 +- util/grub-mkimagexx.c | 2 +- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a7e8d995..6b59c3c7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-21 David Prévot + + Correct some translatable strings. + 2013-12-21 Colin Watson * util/grub-mkrescue.c: Rephrase mkrescue description. diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c index f4446ac93..3b88525bc 100644 --- a/grub-core/commands/file.c +++ b/grub-core/commands/file.c @@ -36,50 +36,50 @@ GRUB_MOD_LICENSE ("GPLv3+"); static const struct grub_arg_option options[] = { {"is-i386-xen-pae-domu", 0, 0, - N_("Check if FILE can be booted as i386 PAE xen unprivileged guest kernel"), + N_("Check if FILE can be booted as i386 PAE Xen unprivileged guest kernel"), 0, 0}, {"is-x86_64-xen-domu", 0, 0, - N_("Check if FILE can be booted as x86_64 xen unprivileged guest kernel"), 0, 0}, + N_("Check if FILE can be booted as x86_64 Xen unprivileged guest kernel"), 0, 0}, {"is-x86-xen-dom0", 0, 0, - N_("Check if FILE can be used as xen x86 privileged guest kernel"), 0, 0}, + N_("Check if FILE can be used as Xen x86 privileged guest kernel"), 0, 0}, {"is-x86-multiboot", 0, 0, N_("Check if FILE can be used as x86 multiboot kernel"), 0, 0}, {"is-x86-multiboot2", 0, 0, N_("Check if FILE can be used as x86 multiboot2 kernel"), 0, 0}, {"is-arm-linux", 0, 0, - N_("Check if FILE is ARM linux"), 0, 0}, + N_("Check if FILE is ARM Linux"), 0, 0}, {"is-ia64-linux", 0, 0, - N_("Check if FILE is IA64 linux"), 0, 0}, + N_("Check if FILE is IA64 Linux"), 0, 0}, {"is-mips-linux", 0, 0, - N_("Check if FILE is MIPS linux"), 0, 0}, + N_("Check if FILE is MIPS Linux"), 0, 0}, {"is-mipsel-linux", 0, 0, - N_("Check if FILE is MIPSEL linux"), 0, 0}, + N_("Check if FILE is MIPSEL Linux"), 0, 0}, {"is-sparc64-linux", 0, 0, - N_("Check if FILE is SPARC64 linux"), 0, 0}, + N_("Check if FILE is SPARC64 Linux"), 0, 0}, {"is-powerpc-linux", 0, 0, - N_("Check if FILE is POWERPC linux"), 0, 0}, + N_("Check if FILE is POWERPC Linux"), 0, 0}, {"is-x86-linux", 0, 0, - N_("Check if FILE is x86 linux"), 0, 0}, + N_("Check if FILE is x86 Linux"), 0, 0}, {"is-x86-linux32", 0, 0, - N_("Check if FILE is x86 linux supporting 32-bit protocol"), 0, 0}, + N_("Check if FILE is x86 Linux supporting 32-bit protocol"), 0, 0}, {"is-x86-kfreebsd", 0, 0, - N_("Check if FILE is x86 kfreebsd"), 0, 0}, + N_("Check if FILE is x86 kFreeBSD"), 0, 0}, {"is-i386-kfreebsd", 0, 0, - N_("Check if FILE is i386 kfreebsd"), 0, 0}, + N_("Check if FILE is i386 kFreeBSD"), 0, 0}, {"is-x86_64-kfreebsd", 0, 0, - N_("Check if FILE is x86_64 kfreebsd"), 0, 0}, + N_("Check if FILE is x86_64 kFreeBSD"), 0, 0}, {"is-x86-knetbsd", 0, 0, - N_("Check if FILE is x86 knetbsd"), 0, 0}, + N_("Check if FILE is x86 kNetBSD"), 0, 0}, {"is-i386-knetbsd", 0, 0, - N_("Check if FILE is i386 knetbsd"), 0, 0}, + N_("Check if FILE is i386 kNetBSD"), 0, 0}, {"is-x86_64-knetbsd", 0, 0, - N_("Check if FILE is x86_64 knetbsd"), 0, 0}, + N_("Check if FILE is x86_64 kNetBSD"), 0, 0}, {"is-i386-efi", 0, 0, N_("Check if FILE is i386 EFI file"), 0, 0}, {"is-x86_64-efi", 0, 0, - N_("Check if FILE is x86-64 EFI file"), 0, 0}, + N_("Check if FILE is x86_64 EFI file"), 0, 0}, {"is-ia64-efi", 0, 0, N_("Check if FILE is IA64 EFI file"), 0, 0}, {"is-arm-efi", 0, 0, @@ -87,11 +87,11 @@ static const struct grub_arg_option options[] = { {"is-hibernated-hiberfil", 0, 0, N_("Check if FILE is hiberfil.sys in hibernated state"), 0, 0}, {"is-x86_64-xnu", 0, 0, - N_("Check if FILE is x86_64 xnu (Mac OS X kernel)"), 0, 0}, + N_("Check if FILE is x86_64 XNU (Mac OS X kernel)"), 0, 0}, {"is-i386-xnu", 0, 0, - N_("Check if FILE is i386 xnu (Mac OS X kernel)"), 0, 0}, + N_("Check if FILE is i386 XNU (Mac OS X kernel)"), 0, 0}, {"is-xnu-hibr", 0, 0, - N_("Check if FILE is xnu (Mac OS X kernel) hibernated image"), 0, 0}, + N_("Check if FILE is XNU (Mac OS X kernel) hibernated image"), 0, 0}, {"is-x86-bios-bootsector", 0, 0, N_("Check if FILE is BIOS bootsector"), 0, 0}, {0, 0, 0, 0, 0, 0} diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c index 9e24b5eaa..a9dfd8852 100644 --- a/grub-core/commands/verify.c +++ b/grub-core/commands/verify.c @@ -966,14 +966,14 @@ GRUB_MOD_INIT(verify) options); cmd_trust = grub_register_extcmd ("trust", grub_cmd_trust, 0, N_("[-s|--skip-sig] PUBKEY_FILE"), - N_("Add PKFILE to trusted keys."), + N_("Add PUBKEY_FILE to trusted keys."), options); cmd_list = grub_register_command ("list_trusted", grub_cmd_list, 0, N_("Show the list of trusted keys.")); cmd_distrust = grub_register_command ("distrust", grub_cmd_distrust, N_("PUBKEY_ID"), - N_("Remove KEYID from trusted keys.")); + N_("Remove PUBKEY_ID from trusted keys.")); } GRUB_MOD_FINI(verify) diff --git a/grub-core/commands/xen/lsxen.c b/grub-core/commands/xen/lsxen.c index def8c8b40..97713102c 100644 --- a/grub-core/commands/xen/lsxen.c +++ b/grub-core/commands/xen/lsxen.c @@ -78,9 +78,9 @@ static grub_command_t cmd_ls, cmd_cat; GRUB_MOD_INIT (lsxen) { cmd_ls = grub_register_command ("xen_ls", grub_cmd_lsxen, N_("[DIR]"), - N_("List XEN storage.")); + N_("List Xen storage.")); cmd_cat = grub_register_command ("xen_cat", grub_cmd_catxen, N_("[DIR]"), - N_("List XEN storage.")); + N_("List Xen storage.")); } GRUB_MOD_FINI (lsxen) diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c index 1046a6ca3..f2b9d7143 100644 --- a/grub-core/osdep/windows/platform.c +++ b/grub-core/osdep/windows/platform.c @@ -94,7 +94,7 @@ get_platform (void) if (!get_efi_privilegies ()) { - grub_util_warn (_("Insufficient privilegies to access firmware, assuming BIOS")); + grub_util_warn (_("Insufficient privileges to access firmware, assuming BIOS")); platform = PLAT_BIOS; } diff --git a/util/grub-glue-efi.c b/util/grub-glue-efi.c index bd8240ca1..936e46ba8 100644 --- a/util/grub-glue-efi.c +++ b/util/grub-glue-efi.c @@ -87,7 +87,7 @@ argp_parser (int key, char *arg, struct argp_state *state) static struct argp argp = { options, argp_parser, N_("[OPTIONS]"), - N_("Glue 32-bit and 64-binary into Apple fat one."), + N_("Glue 32-bit and 64-bit binary into Apple fat one."), NULL, NULL, NULL }; diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c index 7eb10deb3..0a1ac9e51 100644 --- a/util/grub-mkimagexx.c +++ b/util/grub-mkimagexx.c @@ -1379,7 +1379,7 @@ SUFFIX (locate_sections) (const char *kernel_path, != image_target->link_addr) { char *msg - = grub_xasprintf (_("`%s' is miscompiled: it's start address is 0x%llx" + = grub_xasprintf (_("`%s' is miscompiled: its start address is 0x%llx" " instead of 0x%llx: ld.gold bug?"), kernel_path, (unsigned long long) grub_host_to_target_addr (s->sh_addr),