Clarify several translatable messages.

diff --git a/ChangeLog b/ChangeLog
index 2ce6a9568bc7f44973e3633a37beac22ff529c8b..2fc21f9be9b05ec4c0ebc6478bda6eb567314912 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-21  Vladimir Serbinenko  <phcoder@gmail.com>
+2013-12-21  Colin Watson  <cjwatson@ubuntu.com>
+
+       Clarify several translatable messages.
+
 2013-12-20  Colin Watson  <cjwatson@ubuntu.com>
 
        Be more verbose about some configure failures.

diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c
index 474b3fd21f0a267cc7fa06ba28f44970fb0071b1..f4446ac9362d3108986c036a6f49c6e18ca79afc 100644 (file)
--- a/grub-core/commands/file.c
+++ b/grub-core/commands/file.c
@@ -36,12 +36,12 @@ 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 unprivilegied guest"),
+   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 unprivilegied guest"), 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 privilegied 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,

diff --git a/grub-core/commands/i386/cmosdump.c b/grub-core/commands/i386/cmosdump.c
index 952d200a4cff64fe53aba11c639e815c2e7f840d..626485ccbd4fdfcea393a8dae0c08f8a38fa0722 100644 (file)
--- a/grub-core/commands/i386/cmosdump.c
+++ b/grub-core/commands/i386/cmosdump.c
@@ -55,7 +55,7 @@ GRUB_MOD_INIT(cmosdump)
 {
   cmd = grub_register_command ("cmosdump", grub_cmd_cmosdump,
                               0,
-                              N_("Dump CMOS contents."));
+                              N_("Show raw dump of the CMOS contents."));
 }
 
 GRUB_MOD_FINI(cmosdump)

diff --git a/grub-core/commands/i386/cmostest.c b/grub-core/commands/i386/cmostest.c
index 6f7271bf92d7f46101bb56580cb89abe696c746d..e5dea076967f7157797e76ad85639e93df011039 100644 (file)
--- a/grub-core/commands/i386/cmostest.c
+++ b/grub-core/commands/i386/cmostest.c
@@ -109,9 +109,10 @@ GRUB_MOD_INIT(cmostest)
                               N_("Test bit at BYTE:BIT in CMOS."));
   cmd_clean = grub_register_command ("cmosclean", grub_cmd_cmosclean,
                                     N_("BYTE:BIT"),
-                                    N_("Clean bit at BYTE:BIT in CMOS."));
+                                    N_("Clear bit at BYTE:BIT in CMOS."));
   cmd_set = grub_register_command ("cmosset", grub_cmd_cmosset,
                                   N_("BYTE:BIT"),
+                                  /* TRANSLATORS: A bit may be either set (1) or clear (0).  */
                                   N_("Set bit at BYTE:BIT in CMOS."));
 }
 

diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index de6da26160038fc559797d3310d742f3d22c70ef..6af8112074563c6532c7116ea249d905ba3b680a 100644 (file)
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -455,7 +455,7 @@ GRUB_MOD_INIT(loadenv)
 {
   cmd_load =
     grub_register_extcmd ("load_env", grub_cmd_load_env, 0,
-                         N_("[-f FILE] [-s|--skip-sig] [whitelisted_variable_name] [...]"),
+                         N_("[-f FILE] [-s|--skip-sig] [variable_name_to_whitelist] [...]"),
                          N_("Load variables from environment block file."),
                          options);
   cmd_list =

diff --git a/grub-core/commands/pcidump.c b/grub-core/commands/pcidump.c
index 223d86a74e80b4c274dabe5155396eb7f6b9680f..f99ad4a216f485c99778277a8c83747d28c9682f 100644 (file)
--- a/grub-core/commands/pcidump.c
+++ b/grub-core/commands/pcidump.c
@@ -166,7 +166,7 @@ GRUB_MOD_INIT(pcidump)
 {
   cmd = grub_register_extcmd ("pcidump", grub_cmd_pcidump, 0,
                              N_("[-s POSITION] [-d DEVICE]"),
-                             N_("Dump PCI configuration space."), options);
+                             N_("Show raw dump of the PCI configuration space."), options);
 }
 
 GRUB_MOD_FINI(pcidump)

diff --git a/grub-core/commands/syslinuxcfg.c b/grub-core/commands/syslinuxcfg.c
index da753e2cce01906ede6cea5300709a46f67306b0..a4bfc40b6d2167f7e300360de294e647eae8be8f 100644 (file)
--- a/grub-core/commands/syslinuxcfg.c
+++ b/grub-core/commands/syslinuxcfg.c
@@ -47,14 +47,14 @@ syslinux_file_getline (char **line, int cont __attribute__ ((unused)),
 static const struct grub_arg_option options[] =
   {
     {"root",  'r', 0,
-     N_("root directory of the syslinux disk (default /)."),
+     N_("root directory of the syslinux disk [default=/]."),
      N_("DIR"), ARG_TYPE_STRING},
     {"cwd",  'c', 0,
-     N_("home directory of the syslinux config (default directory of configfile)."),
+     N_("current directory of the syslinux [default is parent directory of input file]."),
      N_("DIR"), ARG_TYPE_STRING},
-    {"isolinux",     'i',  0, N_("assume isolinux."), 0, 0},
-    {"pxelinux",     'p',  0, N_("assume pxelinux."), 0, 0},
-    {"syslinux",     's',  0, N_("assume syslinux."), 0, 0},
+    {"isolinux",     'i',  0, N_("assume input is an isolinux configuration file."), 0, 0},
+    {"pxelinux",     'p',  0, N_("assume input is a pxelinux configuration file."), 0, 0},
+    {"syslinux",     's',  0, N_("assume input is a syslinux configuration file."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -183,25 +183,25 @@ GRUB_MOD_INIT(syslinuxcfg)
                            N_("FILE"),
                            /* TRANSLATORS: "syslinux config" means
                               "config as used by syslinux".  */
-                           N_("Parse syslinux config in same context"),
+                           N_("Execute syslinux config in same context"),
                            options);
   cmd_configfile
     = grub_register_extcmd ("syslinux_configfile",
                            grub_cmd_syslinux_source, 0,
                            N_("FILE"),
-                           N_("Parse syslinux config in new context"),
+                           N_("Execute syslinux config in new context"),
                            options);
   cmd_source_extract
     = grub_register_extcmd ("extract_syslinux_entries_source",
                            grub_cmd_syslinux_source, 0,
                            N_("FILE"),
-                           N_("Parse syslinux config in same context taking only menu entries"),
+                           N_("Execute syslinux config in same context taking only menu entries"),
                            options);
   cmd_configfile_extract
     = grub_register_extcmd ("extract_syslinux_entries_configfile",
                            grub_cmd_syslinux_source, 0,
                            N_("FILE"),
-                           N_("Parse syslinux config in new context taking only menu entries"),
+                           N_("Execute syslinux config in new context taking only menu entries"),
                            options);
 }
 

diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
index 87c6d4f2ca422ae68f3b9b743d83944acdbd8b9f..9e24b5eaa735cf5b0ab30000b3ad3fa4506c8cfd 100644 (file)
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -41,7 +41,7 @@ enum
 static const struct grub_arg_option options[] =
   {
     {"skip-sig", 's', 0,
-     N_("Skip signature-checking of the signature file."), 0, ARG_TYPE_NONE},
+     N_("Skip signature-checking of the public key file."), 0, ARG_TYPE_NONE},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -970,7 +970,7 @@ GRUB_MOD_INIT(verify)
                                     options);
   cmd_list = grub_register_command ("list_trusted", grub_cmd_list,
                                    0,
-                                   N_("List trusted keys."));
+                                   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."));

diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
index 14a34bfbf63d42f7b4a750774212a09bc201121c..a0dae380e829fe84f43aacb5be836bf80d333dfd 100644 (file)
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -132,7 +132,7 @@ linux_boot (void)
 
   if (!fdt_addr && machine_type == ARM_FDT_MACHINE_TYPE)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
-                      N_("device tree must be supplied"));
+                      N_("device tree must be supplied (see `devicetree' command)"));
 
   grub_arch_sync_caches ((void *) linux_addr, linux_size);
 
@@ -288,7 +288,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   if (!initrd_start)
     {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("memory allocation failed"));
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
       goto fail;
     }
 #else
@@ -347,7 +347,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
   fdt_addr = grub_efi_allocate_loader_memory (LINUX_FDT_PHYS_OFFSET, size);
   if (!fdt_addr)
     {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("memory allocation failed"));
+      grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
       goto out;
     }
 #else
@@ -384,6 +384,7 @@ GRUB_MOD_INIT (linux)
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
                                      0, N_("Load initrd."));
   cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree,
+                                         /* TRANSLATORS: DTB stands for device tree blob.  */
                                          0, N_("Load DTB file."));
   my_mod = mod;
   fdt_addr = (void *) firmware_get_boot_data ();

diff --git a/grub-core/osdep/aros/config.c b/grub-core/osdep/aros/config.c
index 99f3009e2da9da393839bf78ed8b862ee353630b..c82d0ea8e764bd68b93a567ef6a5dd5cfbc0cefe 100644 (file)
--- a/grub-core/osdep/aros/config.c
+++ b/grub-core/osdep/aros/config.c
@@ -89,6 +89,6 @@ grub_util_load_config (struct grub_util_config *cfg)
       fclose (f);
     }
   else
-    grub_util_warn (_("cannot open config file `%s': %s"),
+    grub_util_warn (_("cannot open configuration file `%s': %s"),
                    cfgfile, strerror (errno));
 }

diff --git a/grub-core/osdep/basic/random.c b/grub-core/osdep/basic/random.c
index bb9758c7743958b5033b13be0d1f9c3e491d728a..b5ccad4ad6d2f32430448a4c6edc79950f7fd33c 100644 (file)
--- a/grub-core/osdep/basic/random.c
+++ b/grub-core/osdep/basic/random.c
@@ -37,5 +37,7 @@ grub_get_random (void *out, grub_size_t len)
 Some functions like grub-mkpaswd and installing on UUID-less disks will be \
 disabled."
   grub_util_error ("%s",
+                  /* TRANSLATORS: The OS itself may very well have a random
+                     number generator but GRUB doesn't know how to access it.  */
                   _("no random number generator is available for your OS"));
 }

diff --git a/grub-core/osdep/hurd/hostdisk.c b/grub-core/osdep/hurd/hostdisk.c
index 57560e1e240f741a9c7db3f7a3c401d5c8d05313..c47b5a5eaae4979dd81dbc6a0aeeb5b14ebbbbca 100644 (file)
--- a/grub-core/osdep/hurd/hostdisk.c
+++ b/grub-core/osdep/hurd/hostdisk.c
@@ -70,12 +70,12 @@ grub_util_hurd_get_disk_info (const char *dev, grub_uint32_t *secsize, grub_disk
                               &data, &data_len);
 
   if (num_ints < 1)
-    grub_util_error (_("Storage info for `%s' does not include type"), dev);
+    grub_util_error (_("Storage information for `%s' does not include type"), dev);
   if (ints[0] != STORAGE_DEVICE)
     grub_util_error (_("`%s' is not a local disk"), dev);
 
   if (num_offsets != 2)
-    grub_util_error (_("Storage info for `%s' does indicate neither plain partition nor plain disk"), dev);
+    grub_util_error (_("Storage information for `%s' indicates neither a plain partition nor a plain disk"), dev);
   if (parent)
     {
       *parent = NULL;

diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
index c093e91ad20c71378d09dd8944f90d882c0d694c..f4b0bb466f773897521aae2739789da6a32b747c 100644 (file)
--- a/grub-core/osdep/unix/config.c
+++ b/grub-core/osdep/unix/config.c
@@ -134,6 +134,6 @@ grub_util_load_config (struct grub_util_config *cfg)
       fclose (f);
     }
   else
-    grub_util_warn (_("cannot open config file `%s': %s"),
+    grub_util_warn (_("cannot open configuration file `%s': %s"),
                    cfgfile, strerror (errno));
 }

diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
index a6dc0709381f93a47e30bc364aa2ea9bb16010cb..a3fcfcacaa814d3ab62104f0dd406ef0c2163613 100644 (file)
--- a/grub-core/osdep/unix/platform.c
+++ b/grub-core/osdep/unix/platform.c
@@ -74,7 +74,7 @@ get_ofpathname (const char *dev)
   return ret;
 
  fail:
-  grub_util_error (_("couldn't find IEEE1275 device tree path for %s.\nYou will have to set `boot-device' variable manually"),
+  grub_util_error (_("couldn't find IEEE1275 device path for %s.\nYou will have to set `boot-device' variable manually"),
                   dev);
 }
 

diff --git a/grub-core/osdep/windows/config.c b/grub-core/osdep/windows/config.c
index 823eac884ee229f393a5a23e91927a6c9f023adf..928ab1a49be2b81344e16bb45c7f4d8762c9a77b 100644 (file)
--- a/grub-core/osdep/windows/config.c
+++ b/grub-core/osdep/windows/config.c
@@ -52,6 +52,6 @@ grub_util_load_config (struct grub_util_config *cfg)
       fclose (f);
     }
   else
-    grub_util_warn (_("cannot open config file `%s': %s"),
+    grub_util_warn (_("cannot open configuration file `%s': %s"),
                    cfgfile, strerror (errno));
 }

diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index eac665c855dacc72b06f8c874d192af6d20dc897..a329c0d36f03cae17e2cfa684619b1318c1c2075 100644 (file)
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -247,7 +247,7 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args)
        config.rtscts = 0;
       else
        return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                          N_("unsupported serial port flow"));
+                          N_("unsupported serial port flow control"));
     }
 
   if (state[OPTION_STOP].set)

diff --git a/util/grub-install.c b/util/grub-install.c
index 683f87d4960c4458423419df33c32f2faf7c2814..fa6f6248b66d8adfed37e94cf2135518485e71a4 100644 (file)
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1182,7 +1182,7 @@ main (int argc, char *argv[])
          if (grub_strcmp (fs->name, "hfs") != 0
              && grub_strcmp (fs->name, "hfsplus") != 0
              && !is_guess)
-           grub_util_error (_("%s is neither hfs nor hfsplus"),
+           grub_util_error (_("filesystem on %s is neither HFS nor HFS+"),
                             macppcdir);
          if (grub_strcmp (fs->name, "hfs") == 0
              || grub_strcmp (fs->name, "hfsplus") == 0)
@@ -1250,7 +1250,7 @@ main (int argc, char *argv[])
     }
 
   if (!config.is_cryptodisk_enabled && have_cryptodisk)
-    grub_util_error (_("attempt to install to cryptodisk without cryptodisk enabled. "
+    grub_util_error (_("attempt to install to encrypted disk without cryptodisk enabled. "
                       "Set `%s' in file `%s'."), "GRUB_ENABLE_CRYPTODISK=1",
                     grub_util_get_config_filename ());
 
@@ -1845,7 +1845,7 @@ main (int argc, char *argv[])
 
          /* Try to make this image bootable using the EFI Boot Manager, if available.  */
          if (!efi_distributor || efi_distributor[0] == '\0')
-           grub_util_error ("%s", _("EFI distributor id isn't specified."));
+           grub_util_error ("%s", _("EFI bootloader id isn't specified."));
          efifile_path = xasprintf ("\\EFI\\%s\\%s",
                                    efi_distributor,
                                    efi_file);

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 02437417d9f386e0fbca4216174847ff6fceb838..0db63283806704c2a9d0dfb79c8adc891cfd67c6 100644 (file)
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -63,8 +63,8 @@ static struct argp_option options[] = {
    /* TRANSLATORS: "memdisk" here isn't an identifier, it can be translated.
     "embed" is a verb (command description).  "*/
    N_("embed FILE as a memdisk image\n"
-      "Implies `-p (memdisk)/boot/grub' but prefix can be overridden by "
-      "later options"), 0},
+      "Implies `-p (memdisk)/boot/grub' and overrides any prefix supplied previously,"
+      " but the prefix itself can be overridden by later options"), 0},
    /* TRANSLATORS: "embed" is a verb (command description).  "*/
   {"config",   'c', N_("FILE"), 0, N_("embed FILE as an early config"), 0},
    /* TRANSLATORS: "embed" is a verb (command description).  "*/

diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index 1112b87de6ea9d872447311a94cf8f80c66ab38e..9db996474e7b8f0e0085bb909ebc93e4c2932732 100644 (file)
--- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c
@@ -80,7 +80,8 @@ argp_parser (int key, char *arg, struct argp_state *state)
 
 struct argp argp = {
   options, argp_parser, NULL,
-  "\v"N_("copies GRUB images into net_directory/subdir/target_cpu-platform."), 
+  "\v"N_("Prepares GRUB network boot images at net_directory/subdir "
+        "assuming net_directory being TFTP root."), 
   NULL, grub_install_help_filter, NULL
 };
 

diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index cfe538bd454687e1b2cfc39c5679d9b26513b50f..44d1f663848cbf55adfb96372a20c1b50ca68234 100644 (file)
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -212,7 +212,7 @@ struct argp argp = {
   options, argp_parser, N_("[OPTION] SOURCE..."),
   /* TRANSLATORS: it generates one single image which is bootable through any method. */
   N_("Make GRUB CD-ROM, disk, pendrive and floppy bootable image.")"\v"
-  N_("Generates a bootable rescue image with specified source files, source directories, or mkisofs options listed by the output of `%s'.\n\n"
+  N_("Generates a bootable CD/USB stick/floppy image with specified source files, source directories, or mkisofs options listed by the output of `%s'.\n\n"
      "Option -- switches to native xorriso command mode.\n\n"
      "Mail xorriso support requests to <bug-xorriso@gnu.org>."), 
   NULL, help_filter, NULL

diff --git a/util/grub-render-label.c b/util/grub-render-label.c
index 9a8eedbc122c801221d7b6d3454ef5fb7b2d99d8..5c087ab3dbfb2e62d17bae1f95f51a189188a94a 100644 (file)
--- a/util/grub-render-label.c
+++ b/util/grub-render-label.c
@@ -58,7 +58,10 @@ static struct argp_option options[] = {
   {"bgcolor",  'b', N_("COLOR"), 0,
    N_("use COLOR for background"), 0},
   {"text",  't', N_("STRING"), 0,
-   N_("set the label to render."), 0},
+  /* TRANSLATORS: The result is always stored to file and
+     never shown directly, so don't use "show" as synonym for render. Use "create" if
+     "render" doesn't translate directly.  */
+   N_("set the label to render"), 0},
   {"output",  'o', N_("FILE"), 0,
    N_("set output filename. Default is STDOUT"), 0},
   {"font",  'f', N_("FILE"), 0,
@@ -121,6 +124,10 @@ argp_parser (int key, char *arg, struct argp_state *state)
 
 static struct argp argp = {
   options, argp_parser, N_("[OPTIONS]"),
+  /* TRANSLATORS: This file takes a text and creates a graphical representation of it,
+     putting the result into .disk_label file. The result is always stored to file and
+     never shown directly, so don't use "show" as synonym for render. Use "create" if
+     "render" doesn't translate directly.  */
   N_("Render Apple .disk_label."),
   NULL, NULL, NULL
 };

diff --git a/util/grub-syslinux2cfg.c b/util/grub-syslinux2cfg.c
index aee938759ae0f85c73c5a18a2f7dbe2d051de3e3..4b9b319cfb23ef8ba96f600f840685530aa8f769 100644 (file)
--- a/util/grub-syslinux2cfg.c
+++ b/util/grub-syslinux2cfg.c
@@ -60,14 +60,16 @@ static struct argp_option options[] = {
   {"root",  'r', N_("DIR"), 0,
    N_("root directory of the syslinux disk [default=/]."), 0},
   {"target-cwd",  'T', N_("DIR"), 0,
-   N_("current directory as it will be seen on runtime [default=$pwd]."), 0},
+   N_(
+      "current directory of the syslinux as it will be seen on runtime  [default is parent directory of input file]."
+), 0},
   {"cwd",  'c', N_("DIR"), 0,
-   N_("current directory of the syslinux disk [default=$pwd]."), 0},
+   N_("current directory of the syslinux [default is parent directory of input file]."), 0},
 
   {"output",  'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
-  {"isolinux",     'i', 0,      0, N_("assume isolinux."), 0},
-  {"pxelinux",     'p', 0,      0, N_("assume pxelinux."), 0},
-  {"syslinux",     's', 0,      0, N_("assume syslinux."), 0},
+  {"isolinux",     'i', 0,      0, N_("assume input is an isolinux configuration file."), 0},
+  {"pxelinux",     'p', 0,      0, N_("assume input is a pxelinux configuration file."), 0},
+  {"syslinux",     's', 0,      0, N_("assume input is a syslinux configuration file."), 0},
   {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},
   { 0, 0, 0, 0, 0, 0 }
 };