vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-11-19 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* conf/i386-pc.rmk (grub_setup_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-setup.c: Include `<grub/i18n.h>'.
        Include `"progname.h"'.
        (main): Initialize gettext.
        * util/i386/pc/grub-setup.c: Gettexttize.
        * util/i386/pc/grub-mkimage.c: Likewise.

        * Makefile.in (po/*.po): Redefine as ...
        ($(foreach lang, $(LINGUAS), po/$(lang).po)): ... this.

        * po/POTFILES: Add `util/i386/pc/grub-setup.c'.
This commit is contained in:
Robert Millan 2009-11-18 23:20:22 +00:00
parent 6323f70508
commit f577f7a09d
7 changed files with 971 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
* conf/i386-pc.rmk (grub_setup_SOURCES): Add `gnulib/progname.c'.
* util/i386/pc/grub-setup.c: Include `<grub/i18n.h>'.
Include `"progname.h"'.
(main): Initialize gettext.
* util/i386/pc/grub-setup.c: Gettexttize.
* util/i386/pc/grub-mkimage.c: Likewise.
* Makefile.in (po/*.po): Redefine as ...
($(foreach lang, $(LINGUAS), po/$(lang).po)): ... this.
* po/POTFILES: Add `util/i386/pc/grub-setup.c'.
2009-11-19 Robert Millan <rmh.grub@aybabtu.com> 2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
* conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/progname.c'. * conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/progname.c'.

2
Makefile.in
View file

@ -476,7 +476,7 @@ po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
$(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_ $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_
$(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
po/*.po: po/$(PACKAGE).pot $(foreach lang, $(LINGUAS), po/$(lang).po): po/$(PACKAGE).pot
$(MSGMERGE) -U $@ po/$(PACKAGE).pot $(MSGMERGE) -U $@ po/$(PACKAGE).pot
po/%.mo: po/%.po po/%.mo: po/%.po

3
conf/i386-pc.rmk
View file

@ -94,7 +94,8 @@ util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
# For grub-setup. # For grub-setup.
util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c \ grub_setup_SOURCES = gnulib/progname.c \
util/i386/pc/grub-setup.c util/hostdisk.c \
util/misc.c util/getroot.c kern/device.c kern/disk.c \ util/misc.c util/getroot.c kern/device.c kern/disk.c \
kern/err.c kern/misc.c kern/parser.c kern/partition.c \ kern/err.c kern/misc.c kern/parser.c kern/partition.c \
kern/file.c kern/fs.c kern/env.c fs/fshelp.c \ kern/file.c kern/fs.c kern/env.c fs/fshelp.c \

1
po/POTFILES
View file

@ -1,5 +1,6 @@
# List of files which contain translatable strings. # List of files which contain translatable strings.
util/i386/pc/grub-mkimage.c util/i386/pc/grub-mkimage.c
util/i386/pc/grub-setup.c
util/mkisofs/eltorito.c util/mkisofs/eltorito.c
util/mkisofs/joliet.c util/mkisofs/joliet.c

879
po/ca.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU GRUB\n" "Project-Id-Version: GNU GRUB\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-16 00:05+0100\n" "POT-Creation-Date: 2009-11-19 00:16+0100\n"
"PO-Revision-Date: 2009-11-17 12:26+0100\n" "PO-Revision-Date: 2009-11-17 12:26+0100\n"
"Last-Translator: Robert Millan <rmh.grub@aybabtu.com>\n" "Last-Translator: Robert Millan <rmh.grub@aybabtu.com>\n"
"Language-Team: None <no-team-yet@li.org>\n" "Language-Team: None <no-team-yet@li.org>\n"
@ -14,7 +14,882 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: util/i386/pc/grub-mkimage.c:322 #: util/i386/pc/grub-mkimage.c:65
msgid "the core image is too small"
msgstr ""
#: util/i386/pc/grub-mkimage.c:77
msgid "cannot compress the kernel image"
msgstr ""
#: util/i386/pc/grub-mkimage.c:117
#, c-format
msgid "the size of memory disk is 0x%x"
msgstr ""
#: util/i386/pc/grub-mkimage.c:124
#, c-format
msgid "the size of config file is 0x%x"
msgstr ""
#: util/i386/pc/grub-mkimage.c:132
#, c-format
msgid "the total module size is 0x%x"
msgstr ""
#: util/i386/pc/grub-mkimage.c:138
msgid "prefix is too long"
msgstr ""
#: util/i386/pc/grub-mkimage.c:199
#, c-format
msgid "the core size is 0x%x"
msgstr ""
#: util/i386/pc/grub-mkimage.c:206
msgid "the core image is too big"
msgstr ""
#: util/i386/pc/grub-mkimage.c:211
#, c-format
msgid "diskboot.img size must be %u bytes"
msgstr ""
#: util/i386/pc/grub-mkimage.c:284
#, c-format
msgid "Core image is too big (%p > %p)\n"
msgstr ""
#: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:587
#, c-format #, c-format
msgid "Try ``%s --help'' for more information.\n" msgid "Try ``%s --help'' for more information.\n"
msgstr "Proveu «%s --help» per a obtenir més informació.\n" msgstr "Proveu «%s --help» per a obtenir més informació.\n"
#: util/i386/pc/grub-mkimage.c:323
#, c-format
msgid ""
"Usage: grub-mkimage [OPTION]... [MODULES]\n"
"\n"
"Make a bootable image of GRUB.\n"
"\n"
" -d, --directory=DIR use images and modules under DIR [default=%s]\n"
" -p, --prefix=DIR set grub_prefix directory [default=%s]\n"
" -m, --memdisk=FILE embed FILE as a memdisk image\n"
" -c, --config=FILE embed FILE as boot config\n"
" -o, --output=FILE output a generated image to FILE [default=stdout]\n"
" -h, --help display this message and exit\n"
" -V, --version print version information and exit\n"
" -v, --verbose print verbose messages\n"
"\n"
"Report bugs to <%s>.\n"
msgstr ""
#: util/i386/pc/grub-mkimage.c:429
#, c-format
msgid "cannot open %s"
msgstr ""
#: util/i386/pc/grub-setup.c:162
#, c-format
msgid "the first sector is <%llu,%u,%u>"
msgstr ""
#: util/i386/pc/grub-setup.c:166
msgid "The first sector of the core file is not sector-aligned"
msgstr ""
#: util/i386/pc/grub-setup.c:176
#, c-format
msgid "saving <%llu,%u,%u> with the segment 0x%x"
msgstr ""
#: util/i386/pc/grub-setup.c:180
msgid "Non-sector-aligned data is found in the core file"
msgstr ""
#: util/i386/pc/grub-setup.c:194
msgid "The sectors of the core file are too fragmented"
msgstr ""
#: util/i386/pc/grub-setup.c:205
#, c-format
msgid "The size of `%s' is not %u"
msgstr ""
#: util/i386/pc/grub-setup.c:222
#, c-format
msgid "The size of `%s' is too small"
msgstr ""
#: util/i386/pc/grub-setup.c:224
#, c-format
msgid "The size of `%s' is too large"
msgstr ""
#: util/i386/pc/grub-setup.c:247
#, c-format
msgid "setting the root device to `%s'"
msgstr ""
#: util/i386/pc/grub-setup.c:261
#, c-format
msgid "Unable to identify a filesystem in %s; safety check can't be performed"
msgstr ""
#: util/i386/pc/grub-setup.c:265
#, c-format
msgid ""
"%s appears to contain a %s filesystem which isn't known to reserve space for "
"DOS-style boot. Installing GRUB there could result in FILESYSTEM "
"DESTRUCTION if valuable data is overwritten by grub-setup (--skip-fs-probe "
"disables this check, use at your own risk)"
msgstr ""
#: util/i386/pc/grub-setup.c:314
msgid "No DOS-style partitions found"
msgstr ""
#: util/i386/pc/grub-setup.c:325
#, c-format
msgid "dos partition is %d, bsd partition is %d"
msgstr ""
#: util/i386/pc/grub-setup.c:330 util/i386/pc/grub-setup.c:355
msgid ""
"Attempting to install GRUB to a partitionless disk. This is a BAD idea."
msgstr ""
#: util/i386/pc/grub-setup.c:336
msgid ""
"Attempting to install GRUB to a partition instead of the MBR. This is a BAD "
"idea."
msgstr ""
#: util/i386/pc/grub-setup.c:365
msgid ""
"This msdos-style partition label has no post-MBR gap; embedding won't be "
"possible!"
msgstr ""
#: util/i386/pc/grub-setup.c:367
msgid ""
"This GPT partition label has no BIOS Boot Partition; embedding won't be "
"possible!"
msgstr ""
#: util/i386/pc/grub-setup.c:374
msgid "Your core.img is unusually large. It won't fit in the embedding area."
msgstr ""
#: util/i386/pc/grub-setup.c:376
msgid "Your embedding area is unusually small. core.img won't fit in it."
msgstr ""
#: util/i386/pc/grub-setup.c:381
#, c-format
msgid "the core image will be embedded at sector 0x%llx"
msgstr ""
#: util/i386/pc/grub-setup.c:418
msgid ""
"Embedding is not possible, but this is required when the root device is on a "
"RAID array or LVM volume."
msgstr ""
#: util/i386/pc/grub-setup.c:421
msgid ""
"Embedding is not possible. GRUB can only be installed in this setup by "
"using blocklists. However, blocklists are UNRELIABLE and its use is "
"discouraged."
msgstr ""
#: util/i386/pc/grub-setup.c:425
msgid "If you really want blocklists, use --force."
msgstr ""
#: util/i386/pc/grub-setup.c:439
#, c-format
msgid "attempting to read the core image `%s' from GRUB"
msgstr ""
#: util/i386/pc/grub-setup.c:440
#, c-format
msgid "attempting to read the core image `%s' from GRUB again"
msgstr ""
#: util/i386/pc/grub-setup.c:449
#, c-format
msgid ""
"succeeded in opening the core image but the size is different (%d != %d)"
msgstr ""
#: util/i386/pc/grub-setup.c:453
#, c-format
msgid "succeeded in opening the core image but cannot read %d bytes"
msgstr ""
#: util/i386/pc/grub-setup.c:476
msgid "succeeded in opening the core image but the data is different"
msgstr ""
#: util/i386/pc/grub-setup.c:487
msgid "couldn't open the core image"
msgstr ""
#: util/i386/pc/grub-setup.c:490
#, c-format
msgid "error message = %s"
msgstr ""
#: util/i386/pc/grub-setup.c:498
#, c-format
msgid "Cannot read `%s' correctly"
msgstr ""
#: util/i386/pc/grub-setup.c:511
msgid "No terminator in the core image"
msgstr ""
#: util/i386/pc/grub-setup.c:522
msgid "Failed to read the first sector of the core image"
msgstr ""
#: util/i386/pc/grub-setup.c:528
msgid "Failed to read the rest sectors of the core image"
msgstr ""
#: util/i386/pc/grub-setup.c:544
#, c-format
msgid "opening the core image `%s'"
msgstr ""
#: util/i386/pc/grub-setup.c:547
#, c-format
msgid "Cannot open `%s'"
msgstr ""
#: util/i386/pc/grub-setup.c:589
#, c-format
msgid ""
"Usage: grub-setup [OPTION]... DEVICE\n"
"\n"
"Set up images to boot from DEVICE.\n"
"DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n"
"\n"
" -b, --boot-image=FILE use FILE as the boot image [default=%s]\n"
" -c, --core-image=FILE use FILE as the core image [default=%s]\n"
" -d, --directory=DIR use GRUB files in the directory DIR [default=%s]\n"
" -m, --device-map=FILE use FILE as the device map [default=%s]\n"
" -r, --root-device=DEV use DEV as the root device [default=guessed]\n"
" -f, --force install even if problems are detected\n"
" -s, --skip-fs-probe do not probe for filesystems in DEVICE\n"
" -h, --help display this message and exit\n"
" -V, --version print version information and exit\n"
" -v, --verbose print verbose messages\n"
"\n"
"Report bugs to <%s>.\n"
msgstr ""
#: util/i386/pc/grub-setup.c:719
#, c-format
msgid "No device is specified.\n"
msgstr ""
#: util/i386/pc/grub-setup.c:725
#, c-format
msgid "Unknown extra argument `%s'.\n"
msgstr ""
#: util/i386/pc/grub-setup.c:742
#, c-format
msgid "Invalid device `%s'.\n"
msgstr ""
#: util/i386/pc/grub-setup.c:755
#, c-format
msgid "Invalid root device `%s'"
msgstr ""
#: util/i386/pc/grub-setup.c:766
#, c-format
msgid "guessing the root device failed, because of `%s'"
msgstr ""
#: util/i386/pc/grub-setup.c:768
msgid "Cannot guess the root device. Specify the option ``--root-device''."
msgstr ""
#: util/mkisofs/eltorito.c:96
#, c-format
msgid "A boot catalog exists and appears corrupted.\n"
msgstr ""
#: util/mkisofs/eltorito.c:97
#, c-format
msgid "Please check the following file: %s.\n"
msgstr ""
#: util/mkisofs/eltorito.c:98
#, c-format
msgid "This file must be removed before a bootable CD can be done.\n"
msgstr ""
#: util/mkisofs/eltorito.c:110
#, c-format
msgid "Error creating boot catalog (%s)"
msgstr ""
#: util/mkisofs/eltorito.c:114
#, c-format
msgid "Error writing to boot catalog (%s)"
msgstr ""
#: util/mkisofs/eltorito.c:144
#, c-format
msgid "Boot catalog cannot be found!\n"
msgstr ""
#: util/mkisofs/eltorito.c:158
#, c-format
msgid "Boot image cannot be found!\n"
msgstr ""
#: util/mkisofs/eltorito.c:221
#, c-format
msgid ""
"\n"
"Size of boot image is %d sectors"
msgstr ""
#: util/mkisofs/eltorito.c:227
#, c-format
msgid "No emulation\n"
msgstr ""
#: util/mkisofs/eltorito.c:235
#, c-format
msgid "Emulating a 1.44 meg floppy\n"
msgstr ""
#: util/mkisofs/eltorito.c:240
#, c-format
msgid "Emulating a 2.88 meg floppy\n"
msgstr ""
#: util/mkisofs/eltorito.c:245
#, c-format
msgid "Emulating a 1.2 meg floppy\n"
msgstr ""
#: util/mkisofs/eltorito.c:249
#, c-format
msgid ""
"\n"
"Error - boot image is not the an allowable size.\n"
msgstr ""
#: util/mkisofs/eltorito.c:269
msgid "Error opening boot catalog for update"
msgstr ""
#: util/mkisofs/eltorito.c:275 util/mkisofs/eltorito.c:277
msgid "Error writing to boot catalog"
msgstr ""
#: util/mkisofs/eltorito.c:291
#, c-format
msgid "Error opening boot image file '%s' for update"
msgstr ""
#: util/mkisofs/eltorito.c:299
#, c-format
msgid "Odd alignment at non-end-of-file in boot image '%s'"
msgstr ""
#: util/mkisofs/eltorito.c:311
#, c-format
msgid "Boot image file '%s' changed unexpectedly"
msgstr ""
#: util/mkisofs/eltorito.c:323
#, c-format
msgid "Error writing to boot image (%s)"
msgstr ""
#: util/mkisofs/joliet.c:359 util/mkisofs/write.c:981
#, c-format
msgid "Unable to generate sane path tables - too many directories (%d)\n"
msgstr ""
#: util/mkisofs/joliet.c:398 util/mkisofs/write.c:1017
#, c-format
msgid "Entry %d not in path tables\n"
msgstr ""
#: util/mkisofs/joliet.c:412
#, c-format
msgid "Fatal goof - directory has amnesia\n"
msgstr ""
#: util/mkisofs/joliet.c:478
#, c-format
msgid "Joliet path table lengths do not match %d %d\n"
msgstr ""
#: util/mkisofs/joliet.c:530
#, c-format
msgid "Unable to locate relocated directory\n"
msgstr ""
#: util/mkisofs/joliet.c:605
#, c-format
msgid "Fatal goof - unable to find directory location\n"
msgstr ""
#: util/mkisofs/joliet.c:654
#, c-format
msgid "Unexpected joliet directory length %d %d %s\n"
msgstr ""
#: util/mkisofs/mkisofs.c:373
#, c-format
msgid "Using \"%s\"\n"
msgstr ""
#: util/mkisofs/mkisofs.c:401
#, c-format
msgid "%s:%d: name required\n"
msgstr ""
#: util/mkisofs/mkisofs.c:411
#, c-format
msgid "%s:%d: equals sign required\n"
msgstr ""
#: util/mkisofs/mkisofs.c:445
#, c-format
msgid "%s:%d: field name \"%s\" unknown\n"
msgstr ""
#: util/mkisofs/mkisofs.c:474
#, c-format
msgid "Usage: %s [options] file...\n"
msgstr ""
#: util/mkisofs/mkisofs.c:476
#, c-format
msgid "Options:\n"
msgstr ""
#: util/mkisofs/mkisofs.c:706
#, c-format
msgid "-i option no longer supported.\n"
msgstr ""
#: util/mkisofs/mkisofs.c:720
#, c-format
msgid "Required boot image pathname missing\n"
msgstr ""
#: util/mkisofs/mkisofs.c:729
#, c-format
msgid "Required boot catalog pathname missing\n"
msgstr ""
#: util/mkisofs/mkisofs.c:737
#, c-format
msgid "Ignoring -no-emul-boot (no-emulation is the default behaviour)\n"
msgstr ""
#: util/mkisofs/mkisofs.c:746
#, c-format
msgid "Abstract filename string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:754
#, c-format
msgid "Application-id string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:762
#, c-format
msgid "Bibliographic filename string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:770
#, c-format
msgid "Copyright filename string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:805
#, c-format
msgid "Preparer string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:816
#, c-format
msgid "Publisher string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:837
#, c-format
msgid "System ID string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:848
#, c-format
msgid "Volume ID string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:856
#, c-format
msgid "Volume set ID string too long\n"
msgstr ""
#: util/mkisofs/mkisofs.c:867
#, c-format
msgid "Volume set sequence number too big\n"
msgstr ""
#: util/mkisofs/mkisofs.c:909 util/mkisofs/mkisofs.c:919
#: util/mkisofs/mkisofs.c:929 util/mkisofs/mkisofs.c:939
#, c-format
msgid "date string must be 16 characters.\n"
msgstr ""
#: util/mkisofs/mkisofs.c:958
msgid "Warning: getrlimit"
msgstr ""
#: util/mkisofs/mkisofs.c:962
msgid "Warning: setrlimit"
msgstr ""
#: util/mkisofs/mkisofs.c:978
#, c-format
msgid "Multisession usage bug: Must specify -C if -M is used.\n"
msgstr ""
#: util/mkisofs/mkisofs.c:984
#, c-format
msgid ""
"Warning: -C specified without -M: old session data will not be merged.\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1023
#, c-format
msgid "can't open logfile: %s"
msgstr ""
#: util/mkisofs/mkisofs.c:1027
#, c-format
msgid "re-directing all messages to %s\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1032
#, c-format
msgid "can't open logfile: %s\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1073
#, c-format
msgid "Unable to open previous session image %s\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1184
#, c-format
msgid "Invalid node - %s\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1246
msgid "Joliet tree sort failed.\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1261
msgid "Unable to open /dev/null\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1265
msgid "Unable to open disc image file\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1387
#, c-format
msgid "Max brk space used %x\n"
msgstr ""
#: util/mkisofs/mkisofs.c:1390
#, c-format
msgid "%llu extents written (%llu MiB)\n"
msgstr ""
#: util/mkisofs/multi.c:161
msgid "Seek error on old image\n"
msgstr ""
#: util/mkisofs/multi.c:179 util/mkisofs/multi.c:250
#, c-format
msgid "**Bad RR version attribute"
msgstr ""
#: util/mkisofs/multi.c:546
#, c-format
msgid ""
"Warning: Neither Rock Ridge (-R) nor TRANS.TBL (-T) name translations were "
"found on previous session. ISO (8.3) file names have been used instead.\n"
msgstr ""
#: util/mkisofs/multi.c:764
#, c-format
msgid "Read error on old image %s\n"
msgstr ""
#: util/mkisofs/multi.c:1084
msgid "Special parameters for cdwrite not specified with -C\n"
msgstr ""
#: util/mkisofs/multi.c:1091
msgid "Malformed cdwrite parameters\n"
msgstr ""
#: util/mkisofs/rock.c:309
#, c-format
msgid "symbolic link ``%s'' to long for one SL System Use Field, splitting"
msgstr ""
#: util/mkisofs/rock.c:517
#, c-format
msgid "Unable to insert transparent compressed file - name conflict\n"
msgstr ""
#: util/mkisofs/rock.c:591
msgid "Extension record too long\n"
msgstr ""
#: util/mkisofs/tree.c:226 util/mkisofs/write.c:565 util/mkisofs/write.c:1037
msgid "Fatal goof\n"
msgstr ""
#: util/mkisofs/tree.c:284
#, c-format
msgid "Unable to generate unique name for file %s\n"
msgstr ""
#: util/mkisofs/tree.c:295 util/mkisofs/tree.c:317
#, c-format
msgid "Using %s for %s%s%s (%s)\n"
msgstr ""
#: util/mkisofs/tree.c:441
#, c-format
msgid "Fatal error - RR overflow for file %s\n"
msgstr ""
#: util/mkisofs/tree.c:449
#, c-format
msgid "Unable to sort directory %s\n"
msgstr ""
#: util/mkisofs/tree.c:480
#, c-format
msgid "Translation table size mismatch %d %d\n"
msgstr ""
#: util/mkisofs/tree.c:746
msgid "Unable to locate directory parent\n"
msgstr ""
#: util/mkisofs/tree.c:796
#, c-format
msgid "Scanning %s\n"
msgstr ""
#: util/mkisofs/tree.c:811
#, c-format
msgid "Unable to open directory %s\n"
msgstr ""
#: util/mkisofs/tree.c:856
#, c-format
msgid "Ignoring file %s\n"
msgstr ""
#: util/mkisofs/tree.c:863
msgid "Overflow of stat buffer\n"
msgstr ""
#: util/mkisofs/tree.c:876
#, c-format
msgid "Excluded by match: %s\n"
msgstr ""
#: util/mkisofs/tree.c:891
#, c-format
msgid "Excluded: %s\n"
msgstr ""
#: util/mkisofs/tree.c:961
#, c-format
msgid "Non-existant or inaccessible: %s\n"
msgstr ""
#: util/mkisofs/tree.c:997 util/mkisofs/tree.c:1103
#, c-format
msgid "Unable to stat file %s - ignoring and continuing.\n"
msgstr ""
#: util/mkisofs/tree.c:1003
#, c-format
msgid "Symlink %s ignored - continuing.\n"
msgstr ""
#: util/mkisofs/tree.c:1028
#, c-format
msgid "Already cached directory seen (%s)\n"
msgstr ""
#: util/mkisofs/tree.c:1070
#, c-format
msgid "File %s is not readable (%s) - ignoring\n"
msgstr ""
#: util/mkisofs/tree.c:1083
#, c-format
msgid "Directory loop - fatal goof (%s %lx %lu).\n"
msgstr ""
#: util/mkisofs/tree.c:1093
#, c-format
msgid "Unknown file type %s - ignoring and continuing.\n"
msgstr ""
#: util/mkisofs/tree.c:1179
#, c-format
msgid "Hidden from ISO9660 tree: %s\n"
msgstr ""
#: util/mkisofs/tree.c:1191
#, c-format
msgid "Hidden from Joliet tree: %s\n"
msgstr ""
#: util/mkisofs/tree.c:1600
#, c-format
msgid "Directories too deep %s\n"
msgstr ""
#: util/mkisofs/tree.c:1632
msgid "Unable to delete non-empty directory\n"
msgstr ""
#: util/mkisofs/tree.c:1655
msgid "Unable to locate child directory in parent list\n"
msgstr ""
#: util/mkisofs/tree.c:1772
#, c-format
msgid "call to search_tree_file with an absolute path, stripping\n"
msgstr ""
#: util/mkisofs/tree.c:1773
#, c-format
msgid "initial path separator. Hope this was intended...\n"
msgstr ""
#: util/mkisofs/write.c:158
#, c-format
msgid "Cannot open '%s'"
msgstr ""
#: util/mkisofs/write.c:166
#, c-format
msgid "cannot fwrite %llu*%llu\n"
msgstr ""
#: util/mkisofs/write.c:248
#, c-format
msgid "cannot open %s\n"
msgstr ""
#: util/mkisofs/write.c:257
#, c-format
msgid "cannot read %llu bytes from %s"
msgstr ""
#: util/mkisofs/write.c:275
#, c-format
msgid "%6.2f%% done, estimate finish %s"
msgstr ""
#: util/mkisofs/write.c:542
#, c-format
msgid "Cache hit for %s%s%s\n"
msgstr ""
#: util/mkisofs/write.c:896
#, c-format
msgid "Unexpected directory length %d %d %s\n"
msgstr ""
#: util/mkisofs/write.c:908
#, c-format
msgid "Continuation entry record length mismatch (%d %d).\n"
msgstr ""
#: util/mkisofs/write.c:1072
#, c-format
msgid "Path table lengths do not match %d %d\n"
msgstr ""
#: util/mkisofs/write.c:1118 util/mkisofs/write.c:1128
#, c-format
msgid "Total extents scheduled to be written = %llu\n"
msgstr ""
#: util/mkisofs/write.c:1145
#, c-format
msgid "Total extents actually written = %llu\n"
msgstr ""
#: util/mkisofs/write.c:1154
#, c-format
msgid ""
"Number of extents written different than what was predicted. Please fix.\n"
msgstr ""
#: util/mkisofs/write.c:1155
#, c-format
msgid "Predicted = %d, written = %llu\n"
msgstr ""
#: util/mkisofs/write.c:1158
#, c-format
msgid "Total translation table size: %d\n"
msgstr ""
#: util/mkisofs/write.c:1159
#, c-format
msgid "Total rockridge attributes bytes: %d\n"
msgstr ""
#: util/mkisofs/write.c:1160
#, c-format
msgid "Total directory bytes: %d\n"
msgstr ""
#: util/mkisofs/write.c:1161
#, c-format
msgid "Path table size(bytes): %d\n"
msgstr ""
#: util/grub.d/10_kfreebsd.in:40
msgid "%s, with kFreeBSD %s"
msgstr ""
#: util/grub.d/10_linux.in:57
msgid "%s, with Linux %s (recovery mode)"
msgstr ""
#: util/grub.d/10_linux.in:59
msgid "%s, with Linux %s"
msgstr ""

26
util/i386/pc/grub-mkimage.c
View file

@ -62,7 +62,7 @@ compress_kernel (char *kernel_img, size_t kernel_size,
props.numThreads = 1; props.numThreads = 1;
if (kernel_size < GRUB_KERNEL_MACHINE_RAW_SIZE) if (kernel_size < GRUB_KERNEL_MACHINE_RAW_SIZE)
grub_util_error ("the core image is too small"); grub_util_error (_("the core image is too small"));
*core_img = xmalloc (kernel_size); *core_img = xmalloc (kernel_size);
memcpy (*core_img, kernel_img, GRUB_KERNEL_MACHINE_RAW_SIZE); memcpy (*core_img, kernel_img, GRUB_KERNEL_MACHINE_RAW_SIZE);
@ -74,7 +74,7 @@ compress_kernel (char *kernel_img, size_t kernel_size,
kernel_size - GRUB_KERNEL_MACHINE_RAW_SIZE, kernel_size - GRUB_KERNEL_MACHINE_RAW_SIZE,
&props, out_props, &out_props_size, &props, out_props, &out_props_size,
0, NULL, &g_Alloc, &g_Alloc) != SZ_OK) 0, NULL, &g_Alloc, &g_Alloc) != SZ_OK)
grub_util_error ("cannot compress the kernel image"); grub_util_error (_("cannot compress the kernel image"));
*core_size += GRUB_KERNEL_MACHINE_RAW_SIZE; *core_size += GRUB_KERNEL_MACHINE_RAW_SIZE;
} }
@ -114,14 +114,14 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
if (memdisk_path) if (memdisk_path)
{ {
memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512); memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
grub_util_info ("the size of memory disk is 0x%x", memdisk_size); grub_util_info (_("the size of memory disk is 0x%x"), memdisk_size);
total_module_size += memdisk_size + sizeof (struct grub_module_header); total_module_size += memdisk_size + sizeof (struct grub_module_header);
} }
if (config_path) if (config_path)
{ {
config_size = grub_util_get_image_size (config_path) + 1; config_size = grub_util_get_image_size (config_path) + 1;
grub_util_info ("the size of config file is 0x%x", config_size); grub_util_info (_("the size of config file is 0x%x"), config_size);
total_module_size += config_size + sizeof (struct grub_module_header); total_module_size += config_size + sizeof (struct grub_module_header);
} }
@ -129,13 +129,13 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
total_module_size += (grub_util_get_image_size (p->name) total_module_size += (grub_util_get_image_size (p->name)
+ sizeof (struct grub_module_header)); + sizeof (struct grub_module_header));
grub_util_info ("the total module size is 0x%x", total_module_size); grub_util_info (_("the total module size is 0x%x"), total_module_size);
kernel_img = xmalloc (kernel_size + total_module_size); kernel_img = xmalloc (kernel_size + total_module_size);
grub_util_load_image (kernel_path, kernel_img); grub_util_load_image (kernel_path, kernel_img);
if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END) if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
grub_util_error ("prefix too long"); grub_util_error (_("prefix is too long"));
strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix); strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
/* Fill in the grub_module_info structure. */ /* Fill in the grub_module_info structure. */
@ -196,19 +196,19 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
compress_kernel (kernel_img, kernel_size + total_module_size, compress_kernel (kernel_img, kernel_size + total_module_size,
&core_img, &core_size); &core_img, &core_size);
grub_util_info ("the core size is 0x%x", core_size); grub_util_info (_("the core size is 0x%x"), core_size);
#if defined(GRUB_MACHINE_PCBIOS) #if defined(GRUB_MACHINE_PCBIOS)
{ {
unsigned num; unsigned num;
num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS); num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
if (num > 0xffff) if (num > 0xffff)
grub_util_error ("the core image is too big"); grub_util_error (_("the core image is too big"));
boot_path = grub_util_get_path (dir, "diskboot.img"); boot_path = grub_util_get_path (dir, "diskboot.img");
boot_size = grub_util_get_image_size (boot_path); boot_size = grub_util_get_image_size (boot_path);
if (boot_size != GRUB_DISK_SECTOR_SIZE) if (boot_size != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("diskboot.img is not one sector size"); grub_util_error (_("diskboot.img size must be %u bytes"), GRUB_DISK_SECTOR_SIZE);
boot_img = grub_util_read_image (boot_path); boot_img = grub_util_read_image (boot_path);
@ -281,7 +281,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
#ifdef GRUB_MACHINE_PCBIOS #ifdef GRUB_MACHINE_PCBIOS
if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER) if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
grub_util_error ("Core image is too big (%p > %p)\n", grub_util_error (_("Core image is too big (%p > %p)\n"),
GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER); GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
#endif #endif
@ -320,7 +320,7 @@ usage (int status)
if (status) if (status)
fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name); fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
else else
printf ("\ printf (_("\
Usage: grub-mkimage [OPTION]... [MODULES]\n\ Usage: grub-mkimage [OPTION]... [MODULES]\n\
\n\ \n\
Make a bootable image of GRUB.\n\ Make a bootable image of GRUB.\n\
@ -335,7 +335,7 @@ Make a bootable image of GRUB.\n\
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n\ Report bugs to <%s>.\n\
", GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT); "), GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -426,7 +426,7 @@ main (int argc, char *argv[])
{ {
fp = fopen (output, "wb"); fp = fopen (output, "wb");
if (! fp) if (! fp)
grub_util_error ("cannot open %s", output); grub_util_error (_("cannot open %s"), output);
free (output); free (output);
} }

122
util/i386/pc/grub-setup.c
View file

@ -1,7 +1,7 @@
/* grub-setup.c - make GRUB usable */ /* grub-setup.c - make GRUB usable */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
* *
* GRUB is free software: you can redistribute it and/or modify * GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -32,8 +32,10 @@
#include <grub/machine/boot.h> #include <grub/machine/boot.h>
#include <grub/machine/kernel.h> #include <grub/machine/kernel.h>
#include <grub/term.h> #include <grub/term.h>
#include <grub/i18n.h>
#include <grub/util/raid.h> #include <grub/util/raid.h>
#include <grub/util/lvm.h> #include <grub/util/lvm.h>
#include <grub/util/getroot.h>
static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT; static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
@ -46,7 +48,7 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#include <grub/util/getroot.h> #include "progname.h"
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include <getopt.h> #include <getopt.h>
@ -157,11 +159,11 @@ setup (const char *dir,
void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset, void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
unsigned length) unsigned length)
{ {
grub_util_info ("the first sector is <%llu,%u,%u>", grub_util_info (_("the first sector is <%llu,%u,%u>"),
sector, offset, length); sector, offset, length);
if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE) if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("The first sector of the core file is not sector-aligned"); grub_util_error (_("The first sector of the core file is not sector-aligned"));
first_sector = sector; first_sector = sector;
} }
@ -171,11 +173,11 @@ setup (const char *dir,
{ {
struct boot_blocklist *prev = block + 1; struct boot_blocklist *prev = block + 1;
grub_util_info ("saving <%llu,%u,%u> with the segment 0x%x", grub_util_info (_("saving <%llu,%u,%u> with the segment 0x%x"),
sector, offset, length, (unsigned) current_segment); sector, offset, length, (unsigned) current_segment);
if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE) if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("Non-sector-aligned data is found in the core file"); grub_util_error (_("Non-sector-aligned data is found in the core file"));
if (block != first_block if (block != first_block
&& (grub_le_to_cpu64 (prev->start) && (grub_le_to_cpu64 (prev->start)
@ -189,7 +191,7 @@ setup (const char *dir,
block--; block--;
if (block->len) if (block->len)
grub_util_error ("The sectors of the core file are too fragmented"); grub_util_error (_("The sectors of the core file are too fragmented"));
} }
last_length = length; last_length = length;
@ -200,7 +202,7 @@ setup (const char *dir,
boot_path = grub_util_get_path (dir, boot_file); boot_path = grub_util_get_path (dir, boot_file);
boot_size = grub_util_get_image_size (boot_path); boot_size = grub_util_get_image_size (boot_path);
if (boot_size != GRUB_DISK_SECTOR_SIZE) if (boot_size != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("The size of `%s' is not %d", grub_util_error (_("The size of `%s' is not %u"),
boot_path, GRUB_DISK_SECTOR_SIZE); boot_path, GRUB_DISK_SECTOR_SIZE);
boot_img = grub_util_read_image (boot_path); boot_img = grub_util_read_image (boot_path);
free (boot_path); free (boot_path);
@ -217,9 +219,9 @@ setup (const char *dir,
core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
>> GRUB_DISK_SECTOR_BITS); >> GRUB_DISK_SECTOR_BITS);
if (core_size < GRUB_DISK_SECTOR_SIZE) if (core_size < GRUB_DISK_SECTOR_SIZE)
grub_util_error ("The size of `%s' is too small", core_path); grub_util_error (_("The size of `%s' is too small"), core_path);
else if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE) else if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
grub_util_error ("The size of `%s' is too large", core_path); grub_util_error (_("The size of `%s' is too large"), core_path);
core_img = grub_util_read_image (core_path); core_img = grub_util_read_image (core_path);
@ -242,7 +244,7 @@ setup (const char *dir,
if (! dest_dev) if (! dest_dev)
grub_util_error ("%s", grub_errmsg); grub_util_error ("%s", grub_errmsg);
grub_util_info ("setting the root device to `%s'", root); grub_util_info (_("setting the root device to `%s'"), root);
if (grub_env_set ("root", root) != GRUB_ERR_NONE) if (grub_env_set ("root", root) != GRUB_ERR_NONE)
grub_util_error ("%s", grub_errmsg); grub_util_error ("%s", grub_errmsg);
@ -256,15 +258,15 @@ setup (const char *dir,
grub_fs_t fs; grub_fs_t fs;
fs = grub_fs_probe (dest_dev); fs = grub_fs_probe (dest_dev);
if (! fs) if (! fs)
grub_util_error ("Unable to identify a filesystem in %s; safety check can't be performed.", grub_util_error (_("Unable to identify a filesystem in %s; safety check can't be performed"),
dest_dev->disk->name); dest_dev->disk->name);
if (! fs->reserved_first_sector) if (! fs->reserved_first_sector)
grub_util_error ("%s appears to contain a %s filesystem which isn't known to " grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
"reserve space for DOS-style boot. Installing GRUB there could " "reserve space for DOS-style boot. Installing GRUB there could "
"result in FILESYSTEM DESTRUCTION if valuable data is overwritten " "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
"by grub-setup (--skip-fs-probe disables this " "by grub-setup (--skip-fs-probe disables this "
"check, use at your own risk).", dest_dev->disk->name, fs->name); "check, use at your own risk)"), dest_dev->disk->name, fs->name);
} }
/* Copy the possible DOS BPB. */ /* Copy the possible DOS BPB. */
@ -309,7 +311,7 @@ setup (const char *dir,
bsd_part = -1; bsd_part = -1;
} }
else else
grub_util_error ("No PC style partitions found"); grub_util_error (_("No DOS-style partitions found"));
} }
else else
dos_part = bsd_part = -1; dos_part = bsd_part = -1;
@ -320,18 +322,18 @@ setup (const char *dir,
bsd_part = grub_le_to_cpu32 (*install_bsd_part); bsd_part = grub_le_to_cpu32 (*install_bsd_part);
} }
grub_util_info ("dos partition is %d, bsd partition is %d", grub_util_info (_("dos partition is %d, bsd partition is %d"),
dos_part, bsd_part); dos_part, bsd_part);
if (! dest_dev->disk->has_partitions) if (! dest_dev->disk->has_partitions)
{ {
grub_util_warn ("Attempting to install GRUB to a partitionless disk. This is a BAD idea."); grub_util_warn (_("Attempting to install GRUB to a partitionless disk. This is a BAD idea."));
goto unable_to_embed; goto unable_to_embed;
} }
if (dest_dev->disk->partition) if (dest_dev->disk->partition)
{ {
grub_util_warn ("Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea."); grub_util_warn (_("Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea."));
goto unable_to_embed; goto unable_to_embed;
} }
@ -350,7 +352,7 @@ setup (const char *dir,
if (! dest_partmap) if (! dest_partmap)
{ {
grub_util_warn ("Attempting to install GRUB to a partitionless disk. This is a BAD idea."); grub_util_warn (_("Attempting to install GRUB to a partitionless disk. This is a BAD idea."));
goto unable_to_embed; goto unable_to_embed;
} }
@ -360,25 +362,23 @@ setup (const char *dir,
if (embed_region.end == embed_region.start) if (embed_region.end == embed_region.start)
{ {
if (! strcmp (dest_partmap, "part_msdos")) if (! strcmp (dest_partmap, "part_msdos"))
grub_util_warn ("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"); grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
else else
grub_util_warn ("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"); grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
goto unable_to_embed; goto unable_to_embed;
} }
if ((unsigned long) core_sectors > embed_region.end - embed_region.start) if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
{ {
if (core_sectors > 62) if (core_sectors > 62)
grub_util_warn ("Your core.img is unusually large. It won't fit in the embedding area."); grub_util_warn (_("Your core.img is unusually large. It won't fit in the embedding area."));
else if (embed_region.end - embed_region.start < 62) else /* embed_region.end - embed_region.start < 62 */
grub_util_warn ("Your embedding area is unusually small. core.img won't fit in it."); grub_util_warn (_("Your embedding area is unusually small. core.img won't fit in it."));
else
grub_util_warn ("Embedding area is too small for core.img.");
goto unable_to_embed; goto unable_to_embed;
} }
grub_util_info ("will embed the core image at sector 0x%llx", embed_region.start); grub_util_info (_("the core image will be embedded at sector 0x%llx"), embed_region.start);
*install_dos_part = grub_cpu_to_le32 (dos_part); *install_dos_part = grub_cpu_to_le32 (dos_part);
*install_bsd_part = grub_cpu_to_le32 (bsd_part); *install_bsd_part = grub_cpu_to_le32 (bsd_part);
@ -415,14 +415,14 @@ setup (const char *dir,
unable_to_embed: unable_to_embed:
if (must_embed) if (must_embed)
grub_util_error ("Embedding is not possible, but this is required when " grub_util_error (_("Embedding is not possible, but this is required when "
"the root device is on a RAID array or LVM volume."); "the root device is on a RAID array or LVM volume."));
grub_util_warn ("Embedding is not possible. GRUB can only be installed in this " grub_util_warn (_("Embedding is not possible. GRUB can only be installed in this "
"setup by using blocklists. However, blocklists are UNRELIABLE and " "setup by using blocklists. However, blocklists are UNRELIABLE and "
"its use is discouraged."); "its use is discouraged."));
if (! force) if (! force)
grub_util_error ("If you really want blocklists, use --force."); grub_util_error (_("If you really want blocklists, use --force."));
/* Make sure that GRUB reads the identical image as the OS. */ /* Make sure that GRUB reads the identical image as the OS. */
tmp_img = xmalloc (core_size); tmp_img = xmalloc (core_size);
@ -436,8 +436,9 @@ unable_to_embed:
for (i = 0; i < MAX_TRIES; i++) for (i = 0; i < MAX_TRIES; i++)
{ {
grub_util_info ("attempting to read the core image `%s' from GRUB%s", grub_util_info ((i == 0) ? _("attempting to read the core image `%s' from GRUB")
core_path_dev, (i == 0) ? "" : " again"); : _("attempting to read the core image `%s' from GRUB again"),
core_path_dev);
grub_disk_cache_invalidate_all (); grub_disk_cache_invalidate_all ();
@ -445,11 +446,11 @@ unable_to_embed:
if (file) if (file)
{ {
if (grub_file_size (file) != core_size) if (grub_file_size (file) != core_size)
grub_util_info ("succeeded in opening the core image but the size is different (%d != %d)", grub_util_info (_("succeeded in opening the core image but the size is different (%d != %d)"),
(int) grub_file_size (file), (int) core_size); (int) grub_file_size (file), (int) core_size);
else if (grub_file_read (file, tmp_img, core_size) else if (grub_file_read (file, tmp_img, core_size)
!= (grub_ssize_t) core_size) != (grub_ssize_t) core_size)
grub_util_info ("succeeded in opening the core image but cannot read %d bytes", grub_util_info (_("succeeded in opening the core image but cannot read %d bytes"),
(int) core_size); (int) core_size);
else if (memcmp (core_img, tmp_img, core_size) != 0) else if (memcmp (core_img, tmp_img, core_size) != 0)
{ {
@ -472,7 +473,7 @@ unable_to_embed:
} }
#endif #endif
grub_util_info ("succeeded in opening the core image but the data is different"); grub_util_info (_("succeeded in opening the core image but the data is different"));
} }
else else
{ {
@ -483,10 +484,10 @@ unable_to_embed:
grub_file_close (file); grub_file_close (file);
} }
else else
grub_util_info ("couldn't open the core image"); grub_util_info (_("couldn't open the core image"));
if (grub_errno) if (grub_errno)
grub_util_info ("error message = %s", grub_errmsg); grub_util_info (_("error message = %s"), grub_errmsg);
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
sync (); sync ();
@ -494,7 +495,7 @@ unable_to_embed:
} }
if (i == MAX_TRIES) if (i == MAX_TRIES)
grub_util_error ("Cannot read `%s' correctly", core_path_dev); grub_util_error (_("Cannot read `%s' correctly"), core_path_dev);
/* Clean out the blocklists. */ /* Clean out the blocklists. */
block = first_block; block = first_block;
@ -507,7 +508,7 @@ unable_to_embed:
block--; block--;
if ((char *) block <= core_img) if ((char *) block <= core_img)
grub_util_error ("No terminator in the core image"); grub_util_error (_("No terminator in the core image"));
} }
/* Now read the core image to determine where the sectors are. */ /* Now read the core image to determine where the sectors are. */
@ -518,13 +519,13 @@ unable_to_embed:
file->read_hook = save_first_sector; file->read_hook = save_first_sector;
if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE) if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
!= GRUB_DISK_SECTOR_SIZE) != GRUB_DISK_SECTOR_SIZE)
grub_util_error ("Failed to read the first sector of the core image"); grub_util_error (_("Failed to read the first sector of the core image"));
block = first_block; block = first_block;
file->read_hook = save_blocklists; file->read_hook = save_blocklists;
if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE) if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
!= (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE) != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
grub_util_error ("Failed to read the rest sectors of the core image"); grub_util_error (_("Failed to read the rest sectors of the core image"));
grub_file_close (file); grub_file_close (file);
@ -540,10 +541,10 @@ unable_to_embed:
*install_bsd_part = grub_cpu_to_le32 (bsd_part); *install_bsd_part = grub_cpu_to_le32 (bsd_part);
/* Write the first two sectors of the core image onto the disk. */ /* Write the first two sectors of the core image onto the disk. */
grub_util_info ("opening the core image `%s'", core_path); grub_util_info (_("opening the core image `%s'"), core_path);
fp = fopen (core_path, "r+b"); fp = fopen (core_path, "r+b");
if (! fp) if (! fp)
grub_util_error ("Cannot open `%s'", core_path); grub_util_error (_("Cannot open `%s'"), core_path);
grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp); grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp);
fclose (fp); fclose (fp);
@ -583,9 +584,9 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-setup --help'' for more information.\n"); fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
else else
printf ("\ printf (_("\
Usage: grub-setup [OPTION]... DEVICE\n\ Usage: grub-setup [OPTION]... DEVICE\n\
\n\ \n\
Set up images to boot from DEVICE.\n\ Set up images to boot from DEVICE.\n\
@ -603,7 +604,7 @@ DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n\ Report bugs to <%s>.\n\
", "),
DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY, DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT); DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
@ -633,7 +634,10 @@ main (int argc, char *argv[])
char *dest_dev; char *dest_dev;
int must_embed = 0, force = 0, fs_probe = 1; int must_embed = 0, force = 0, fs_probe = 1;
progname = "grub-setup"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -712,13 +716,13 @@ main (int argc, char *argv[])
/* Obtain DEST_DEV. */ /* Obtain DEST_DEV. */
if (optind >= argc) if (optind >= argc)
{ {
fprintf (stderr, "No device is specified.\n"); fprintf (stderr, _("No device is specified.\n"));
usage (1); usage (1);
} }
if (optind + 1 != argc) if (optind + 1 != argc)
{ {
fprintf (stderr, "Unknown extra argument `%s'.\n", argv[optind + 1]); fprintf (stderr, _("Unknown extra argument `%s'.\n"), argv[optind + 1]);
usage (1); usage (1);
} }
@ -735,7 +739,7 @@ main (int argc, char *argv[])
dest_dev = grub_util_get_grub_dev (argv[optind]); dest_dev = grub_util_get_grub_dev (argv[optind]);
if (! dest_dev) if (! dest_dev)
{ {
fprintf (stderr, "Invalid device `%s'.\n", argv[optind]); fprintf (stderr, _("Invalid device `%s'.\n"), argv[optind]);
usage (1); usage (1);
} }
} }
@ -748,7 +752,7 @@ main (int argc, char *argv[])
char *tmp = get_device_name (root_dev); char *tmp = get_device_name (root_dev);
if (! tmp) if (! tmp)
grub_util_error ("Invalid root device `%s'", root_dev); grub_util_error (_("Invalid root device `%s'"), root_dev);
tmp = xstrdup (tmp); tmp = xstrdup (tmp);
free (root_dev); free (root_dev);
@ -759,9 +763,9 @@ main (int argc, char *argv[])
root_dev = grub_util_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY)); root_dev = grub_util_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY));
if (! root_dev) if (! root_dev)
{ {
grub_util_info ("guessing the root device failed, because of `%s'", grub_util_info (_("guessing the root device failed, because of `%s'"),
grub_errmsg); grub_errmsg);
grub_util_error ("Cannot guess the root device. Specify the option ``--root-device''."); grub_util_error (_("Cannot guess the root device. Specify the option ``--root-device''."));
} }
} }