Decrease number of strings to translate.

diff --git a/ChangeLog b/ChangeLog
index ee9f467d593e5819e3ec99d4026b06195d9b4fc5..fdf8c7fb20ea2c8af0be3cb21336a5d33c2a54cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Decrease number of strings to translate.
+
 2013-12-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/arm/dl.c: Remove unnecessarry execution mode check.

diff --git a/grub-core/commands/tr.c b/grub-core/commands/tr.c
index adb292b55296d62446c9c0644f1b988028fcfe54..84ad6ff8f96fb9275f2645e77c2ebb5f9f7ba9f4 100644 (file)
--- a/grub-core/commands/tr.c
+++ b/grub-core/commands/tr.c
@@ -29,7 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
-    { "set", 's', 0, N_("Variable name to update."), N_("VARNAME"), ARG_TYPE_STRING },
+    { "set", 's', 0, N_("Set a variable to return value."), N_("VARNAME"), ARG_TYPE_STRING },
     { "upcase", 'U', 0, N_("Translate to upper case."), 0, 0 },
     { "downcase", 'D', 0, N_("Translate to lower case."), 0, 0 },
     { 0, 0, 0, 0, 0, 0 }

diff --git a/grub-core/kern/arm64/dl.c b/grub-core/kern/arm64/dl.c
index 07756110d79c754fd26c104e91e22007a8d9ef33..e19ba6a0d58ad0fb7b2a9fb204be350e1a19d01a 100644 (file)
--- a/grub-core/kern/arm64/dl.c
+++ b/grub-core/kern/arm64/dl.c
@@ -149,7 +149,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
 
            if (!grub_arm_64_check_xxxx26_offset (offset))
                return grub_error (GRUB_ERR_BAD_MODULE,
-                                  N_("Trampoline out of range"));
+                                  "trampoline out of range");
 
            grub_arm64_set_xxxx26_offset (place, offset);
          }

diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index 732a47a873f2903c9a417f73c4db55026a667f5f..6e4705173a2e5f61981ad7a0998f673ad969bf89 100644 (file)
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -695,9 +695,9 @@ static grub_command_t cmd_xen, cmd_initrd, cmd_module, cmd_multiboot;
 GRUB_MOD_INIT (xen)
 {
   cmd_xen = grub_register_command ("linux", grub_cmd_xen,
-                                  0, N_("Load linux."));
+                                  0, N_("Load Linux."));
   cmd_multiboot = grub_register_command ("multiboot", grub_cmd_xen,
-                                        0, N_("Load linux."));
+                                        0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
                                      0, N_("Load initrd."));
   cmd_module = grub_register_command ("module", grub_cmd_module,

diff --git a/grub-core/osdep/windows/dl.c b/grub-core/osdep/windows/dl.c
index b18a4a0099371eca5ef708d973991275e44156c8..eec6a24ad7f721258320a02f46c632d9e00adc68 100644 (file)
--- a/grub-core/osdep/windows/dl.c
+++ b/grub-core/osdep/windows/dl.c
@@ -32,7 +32,7 @@ grub_osdep_dl_memalign (grub_size_t align, grub_size_t size)
   void *ret;
   if (align > 4096)
     {
-      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, N_("too large alignment"));
+      grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "too large alignment");
       return NULL;
     }
 

diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index a647af4ad756f455f4c5271cd5413e68e6e562e9..bc987aadc165bfdd85bf39ed1fad603f0d95b1eb 100644 (file)
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -42,7 +42,7 @@
     "no,xz,gz,lzo", OPTION_ARG_OPTIONAL,                                 \
     N_("compress GRUB files [optional]"), 1 },                           \
   {"core-compress", GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS,                \
-      N_("xz|none|auto"),                                              \
+      "xz|none|auto",                                          \
       0, N_("choose the compression to use for core image"), 2},       \
     /* TRANSLATORS: platform here isn't identifier. It can be translated. */ \
   { "directory", 'd', N_("DIR"), 0,                                    \
@@ -62,7 +62,7 @@
   { "pubkey",   'k', N_("FILE"), 0,                                    \
       N_("embed FILE as public key for signature checking"), 0},       \
   { "verbose", 'v', 0, 0,                                              \
-    N_("increase verbosity"), 1 }
+    N_("print verbose messages."), 1 }
 
 int
 grub_install_parse (int key, char *arg);

diff --git a/util/grub-install.c b/util/grub-install.c
index 81be6fb5cd35db2e67801f03ca48ba78c5c1b3c7..c6cfc496808e4ec7d799de39278314adedd3a225 100644 (file)
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1176,7 +1176,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 hfsplue"),
+           grub_util_error (_("%s is neither hfs nor hfsplus"),
                             macppcdir);
          if (grub_strcmp (fs->name, "hfs") == 0
              || grub_strcmp (fs->name, "hfsplus") == 0)

diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index 19d94e7f2dba3918f51d5d870efb1dcab1246a00..7eb10deb30e66546e196dd138a655b13d140f1cd 100644 (file)
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -842,7 +842,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
                       sym_addr -= offset;
                       sym_addr -= SUFFIX (entry_point);
                       if (!grub_arm_64_check_xxxx26_offset (sym_addr))
-                        grub_util_error ("%s", _("CALL26 Relocation out of range"));
+                        grub_util_error ("%s", "CALL26 Relocation out of range");
 
                       grub_arm64_set_xxxx26_offset((grub_uint32_t *)target,
                                                     sym_addr);
@@ -1201,7 +1201,7 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
                  case R_AARCH64_JUMP26:
                    break;
                  default:
-                   grub_util_error (_("fixup for relocation %u is not implemented yet"),
+                   grub_util_error (_("relocation 0x%x is not implemented yet"),
                                     (unsigned int) ELF_R_TYPE (info));
                    break;
                  }
@@ -1239,7 +1239,8 @@ SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
                    }
                    break;
                  default:
-                   grub_util_error (_("fixup for relocation 0x%x not implemented"), ELF_R_TYPE (info));
+                   grub_util_error (_("relocation 0x%x is not implemented yet"),
+                                    (unsigned int) ELF_R_TYPE (info));
                    break;
                  }
                break;

diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index 3b87e11ba727542dda1226cf92d32f3de96b01e4..1112b87de6ea9d872447311a94cf8f80c66ab38e 100644 (file)
--- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c
@@ -79,7 +79,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
 
 
 struct argp argp = {
-  options, argp_parser, N_("[OPTION]"),
+  options, argp_parser, NULL,
   "\v"N_("copies GRUB images into net_directory/subdir/target_cpu-platform."), 
   NULL, grub_install_help_filter, NULL
 };

diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
index 4b0464cc28535cf1dfaf376ba9f45b4d087eee9f..576ab400db80540e2a08c5a52ed54829568f2662 100644 (file)
--- a/util/grub-mkstandalone.c
+++ b/util/grub-mkstandalone.c
@@ -42,7 +42,7 @@ static struct argp_option options[] = {
   {"output", 'o', N_("FILE"),
    0, N_("save output in FILE [required]"), 2},
   {"format", 'O', N_("FILE"), 0, 0, 2},
-  {"compression", 'C', N_("xz|none|auto"), OPTION_HIDDEN, 0, 2},
+  {"compression", 'C', "xz|none|auto", OPTION_HIDDEN, 0, 2},
   {0, 0, 0, 0, 0, 0}
 };
 

diff --git a/util/grub-syslinux2cfg.c b/util/grub-syslinux2cfg.c
index 54add8c47a61bb4b097eabf24f5dc9ce2cd55f51..aee938759ae0f85c73c5a18a2f7dbe2d051de3e3 100644 (file)
--- a/util/grub-syslinux2cfg.c
+++ b/util/grub-syslinux2cfg.c
@@ -56,15 +56,15 @@ struct arguments
 
 static struct argp_option options[] = {
   {"target-root",  't', N_("DIR"), 0,
-   N_("root directory as it will be seen on runtime (default /)."), 0},
+   N_("root directory as it will be seen on runtime [default=/]."), 0},
   {"root",  'r', N_("DIR"), 0,
-   N_("root directory of the syslinux disk (default /)."), 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 as it will be seen on runtime [default=$pwd]."), 0},
   {"cwd",  'c', N_("DIR"), 0,
-   N_("current directory of the syslinux disk (default $pwd)."), 0},
+   N_("current directory of the syslinux disk [default=$pwd]."), 0},
 
-  {"output",  'o', N_("FILE"), 0, N_("write output to FILE (default stdout)."), 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},
@@ -137,7 +137,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
 }
 
 static struct argp argp = {
-  options, argp_parser, N_("[OPTIONS] FILE ROOT"),
+  options, argp_parser, N_("FILE"),
   N_("Transform syslinux config into GRUB one."),
   NULL, NULL, NULL
 };

diff --git a/util/mkimage.c b/util/mkimage.c
index 709b26cdeabf44e5e35e365c2f788d51624004e3..26d9816e07e02b00f3237440c64891a1dcddfe9c 100644 (file)
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -859,7 +859,7 @@ grub_arm_reloc_thm_call (grub_uint16_t *target, Elf32_Addr sym_addr)
      somewhere else.  */
   if (offset < -0x200000 || offset >= 0x200000)
     return grub_error (GRUB_ERR_BAD_MODULE,
-                      N_("THM_CALL Relocation out of range."));
+                      "THM_CALL Relocation out of range.");
 
   grub_dprintf ("dl", "    relative destination = %p",
                (char *) target + offset);
@@ -879,7 +879,7 @@ grub_arm_reloc_thm_jump19 (grub_uint16_t *target, Elf32_Addr sym_addr)
 
   if (!(sym_addr & 1))
     return grub_error (GRUB_ERR_BAD_MODULE,
-                      N_("Relocation targeting wrong execution state"));
+                      "Relocation targeting wrong execution state");
 
   offset = grub_arm_thm_jump19_get_offset (target);
 
@@ -888,7 +888,7 @@ grub_arm_reloc_thm_jump19 (grub_uint16_t *target, Elf32_Addr sym_addr)
 
   if (!grub_arm_thm_jump19_check_offset (offset))
     return grub_error (GRUB_ERR_BAD_MODULE,
-                      N_("THM_JUMP19 Relocation out of range."));
+                      "THM_JUMP19 Relocation out of range.");
 
   grub_arm_thm_jump19_set_offset (target, offset);
 
@@ -907,14 +907,14 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
 
   if (sym_addr & 1)
     return grub_error (GRUB_ERR_BAD_MODULE,
-                      N_("Relocation targeting wrong execution state"));
+                      "Relocation targeting wrong execution state");
 
   offset = grub_arm_jump24_get_offset (target);
   offset += sym_addr;
 
   if (!grub_arm_jump24_check_offset (offset))
     return grub_error (GRUB_ERR_BAD_MODULE,
-                      N_("JUMP24 Relocation out of range."));
+                      "JUMP24 Relocation out of range.");
 
 
   grub_arm_jump24_set_offset (target, offset);