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

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

Browse source 
* conf/common.rmk (sbin_UTILITIES): Add `grub-mkdevicemap'.
        (grub_mkdevicemap_SOURCES): New variable.
        (grub_probe_SOURCES, grub_fstest_SOURCES, grub_mkfont_SOURCES)
        (grub_mkrelpath_SOURCES, grub_editenv_SOURCES)
        (grub_pe2elf_SOURCES): Add `gnulib/progname.c'.
        * conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-mkdevicemap'.
        (grub_mkdevicemap_SOURCES): Remove.
        * conf/i386-efi.rmk: Likewise.
        * conf/i386-ieee1275.rmk: Likewise.
        * conf/i386-pc.rmk: Likewise.
        * conf/powerpc-ieee1275.rmk: Likewise.
        * conf/sparc64-ieee1275.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.
        * util/elf/grub-mkimage.c: Include `<grub/i18n.h>' and `"progname.h"'.
        (usage): Fix strings to use `program_name'.
        (main): Initialize gettext.
        * util/grub-editenv.c: Likewise.
        * util/grub-emu.c: Likewise.
        * util/grub-fstest.c: Likewise.
        * util/grub-mkdevicemap.c: Likewise.
        * util/grub-mkfont.c: Likewise.
        * util/grub-mkrelpath.c: Likewise.
        * util/grub-pe2elf.c: Likewise.
        * util/grub-probe.c: Likewise.
        * util/sparc64/ieee1275/grub-mkimage.c: Likewise.
        * util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
        * util/sparc64/ieee1275/grub-setup.c: Likewise.

        * util/misc.c: Include `"progname.h"'.
        (progname): Remove variable.
        (grub_util_warn, grub_util_info, grub_util_error): Use `program_name'.
This commit is contained in:
Robert Millan 2009-11-25 23:10:02 +00:00
parent 6f61ed5513
commit 8a4c07fd6a
25 changed files with 750 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ChangeLog
View file

@ -1,3 +1,37 @@
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
* conf/common.rmk (sbin_UTILITIES): Add `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): New variable.
(grub_probe_SOURCES, grub_fstest_SOURCES, grub_mkfont_SOURCES)
(grub_mkrelpath_SOURCES, grub_editenv_SOURCES)
(grub_pe2elf_SOURCES): Add `gnulib/progname.c'.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): Remove.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* util/elf/grub-mkimage.c: Include `<grub/i18n.h>' and `"progname.h"'.
(usage): Fix strings to use `program_name'.
(main): Initialize gettext.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
* util/misc.c: Include `"progname.h"'.
(progname): Remove variable.
(grub_util_warn, grub_util_info, grub_util_error): Use `program_name'.
2009-11-25 Felix Zielcke <fzielcke@z-51.de> 2009-11-25 Felix Zielcke <fzielcke@z-51.de>
* util/grub.d/10_linux.in (linux_entry): Quote the arguments to * util/grub.d/10_linux.in (linux_entry): Quote the arguments to

21
conf/common.rmk
View file

@ -1,15 +1,21 @@
# -*- makefile -*- # -*- makefile -*-
sbin_UTILITIES += grub-mkdevicemap
grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
util/deviceiter.c \
util/devicemap.c util/misc.c
# For grub-mkelfimage. # For grub-mkelfimage.
bin_UTILITIES += grub-mkelfimage bin_UTILITIES += grub-mkelfimage
grub_mkelfimage_SOURCES = util/elf/grub-mkimage.c util/misc.c \ grub_mkelfimage_SOURCES = gnulib/progname.c \
util/elf/grub-mkimage.c util/misc.c \
util/resolve.c util/resolve.c
util/elf/grub-mkimage.c_DEPENDENCIES = Makefile util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
# For grub-probe. # For grub-probe.
sbin_UTILITIES += grub-probe sbin_UTILITIES += grub-probe
util/grub-probe.c_DEPENDENCIES = grub_probe_init.h util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
grub_probe_SOURCES = util/grub-probe.c \ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c \
util/hostdisk.c util/misc.c util/getroot.c \ util/hostdisk.c util/misc.c util/getroot.c \
kern/device.c kern/disk.c kern/err.c kern/misc.c \ kern/device.c kern/disk.c kern/err.c kern/misc.c \
kern/parser.c kern/partition.c kern/file.c \ kern/parser.c kern/partition.c kern/file.c \
@ -44,7 +50,8 @@ grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 \
# For grub-fstest. # For grub-fstest.
util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c util/misc.c \ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
util/misc.c \
kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c \ kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c \
disk/host.c disk/loopback.c kern/list.c kern/command.c \ disk/host.c disk/loopback.c kern/list.c kern/command.c \
lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c \ lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c \
@ -66,14 +73,14 @@ grub_fstest_SOURCES = util/grub-fstest.c util/hostfs.c util/misc.c \
# For grub-mkfont. # For grub-mkfont.
ifeq ($(enable_grub_mkfont), yes) ifeq ($(enable_grub_mkfont), yes)
bin_UTILITIES += grub-mkfont bin_UTILITIES += grub-mkfont
grub_mkfont_SOURCES = util/grub-mkfont.c util/misc.c grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
grub_mkfont_CFLAGS = $(freetype_cflags) grub_mkfont_CFLAGS = $(freetype_cflags)
grub_mkfont_LDFLAGS = $(freetype_libs) grub_mkfont_LDFLAGS = $(freetype_libs)
endif endif
# For grub-mkrelpath. # For grub-mkrelpath.
bin_UTILITIES += grub-mkrelpath bin_UTILITIES += grub-mkrelpath
grub_mkrelpath_SOURCES = util/grub-mkrelpath.c util/misc.c grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
# For the parser. # For the parser.
grub_script.tab.c grub_script.tab.h: script/parser.y grub_script.tab.c grub_script.tab.h: script/parser.y
@ -121,7 +128,7 @@ DISTCLEANFILES += grub_fstest_init.c
# for grub-editenv # for grub-editenv
bin_UTILITIES += grub-editenv bin_UTILITIES += grub-editenv
grub_editenv_SOURCES = util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c
CLEANFILES += grub-editenv CLEANFILES += grub-editenv
# Needed for genmk.rb to work # Needed for genmk.rb to work
@ -129,7 +136,7 @@ ifeq (0,1)
bin_UTILITIES += grub-macho2img grub-pe2elf bin_UTILITIES += grub-macho2img grub-pe2elf
endif endif
grub_pe2elf_SOURCES = util/grub-pe2elf.c util/misc.c grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c
CLEANFILES += grub-pe2elf CLEANFILES += grub-pe2elf
grub_macho2img_SOURCES = util/grub-macho2img.c grub_macho2img_SOURCES = util/grub-macho2img.c

3
conf/i386-coreboot.rmk
View file

@ -94,10 +94,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# Utilities. # Utilities.
sbin_UTILITIES = grub-mkdevicemap
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c util/devicemap.c util/misc.c
sbin_SCRIPTS += grub-install sbin_SCRIPTS += grub-install

3
conf/i386-efi.rmk
View file

@ -9,7 +9,6 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
# Utilities. # Utilities.
bin_UTILITIES = grub-mkimage bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-mkdevicemap
# For grub-mkimage. # For grub-mkimage.
grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \ grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
@ -24,8 +23,6 @@ util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
# fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \ # fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \
# kern/fs.c kern/env.c fs/fshelp.c # kern/fs.c kern/env.c fs/fshelp.c
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c util/devicemap.c util/misc.c
# Scripts. # Scripts.

3
conf/i386-ieee1275.rmk
View file

@ -48,10 +48,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# Utilities. # Utilities.
sbin_UTILITIES = grub-mkdevicemap
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c util/devicemap.c util/misc.c
# Scripts. # Scripts.

6
conf/i386-pc.rmk
View file

@ -81,7 +81,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
# Utilities. # Utilities.
bin_UTILITIES = grub-mkimage bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-setup grub-mkdevicemap sbin_UTILITIES = grub-setup
# For grub-mkimage. # For grub-mkimage.
grub_mkimage_SOURCES = gnulib/progname.c util/i386/pc/grub-mkimage.c util/misc.c \ grub_mkimage_SOURCES = gnulib/progname.c util/i386/pc/grub-mkimage.c util/misc.c \
@ -109,10 +109,6 @@ grub_setup_SOURCES = gnulib/progname.c \
util/raid.c util/lvm.c \ util/raid.c util/lvm.c \
grub_setup_init.c grub_setup_init.c
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c
sbin_SCRIPTS += grub-install sbin_SCRIPTS += grub-install
grub_install_SOURCES = util/grub-install.in grub_install_SOURCES = util/grub-install.in

3
conf/powerpc-ieee1275.rmk
View file

@ -29,10 +29,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
pkglib_PROGRAMS = kernel.img pkglib_PROGRAMS = kernel.img
# Utilities. # Utilities.
sbin_UTILITIES = grub-mkdevicemap
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c util/devicemap.c util/misc.c
kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \ kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \

4
conf/sparc64-ieee1275.rmk
View file

@ -59,7 +59,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
# Utilities. # Utilities.
bin_UTILITIES = grub-mkimage bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-setup grub-mkdevicemap grub-ofpathname sbin_UTILITIES = grub-setup grub-ofpathname
# For grub-mkimage. # For grub-mkimage.
grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \ grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
@ -85,8 +85,6 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c \
util/raid.c util/lvm.c \ util/raid.c util/lvm.c \
grub_setup_init.c grub_setup_init.c
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/ieee1275/ofpath.c util/ieee1275/devicemap.c util/misc.c util/ieee1275/ofpath.c util/ieee1275/devicemap.c util/misc.c
# For grub-ofpathname. # For grub-ofpathname.

3
conf/x86_64-efi.rmk
View file

@ -9,7 +9,6 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
# Utilities. # Utilities.
bin_UTILITIES = grub-mkimage bin_UTILITIES = grub-mkimage
sbin_UTILITIES = grub-mkdevicemap
# For grub-mkimage. # For grub-mkimage.
grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \ grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
@ -23,8 +22,6 @@ grub_mkimage_SOURCES = util/i386/efi/grub-mkimage.c util/misc.c \
# fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \ # fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c \
# kern/fs.c kern/env.c fs/fshelp.c # kern/fs.c kern/env.c fs/fshelp.c
# For grub-mkdevicemap.
grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
util/devicemap.c util/misc.c util/devicemap.c util/misc.c
# Scripts. # Scripts.

30
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-22 11:45+0000\n" "POT-Creation-Date: 2009-11-25 23:57+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"
@ -40,7 +40,7 @@ msgstr ""
msgid "Core image is too big (%p > %p)\n" msgid "Core image is too big (%p > %p)\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:587 #: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:589
#, 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"
@ -162,39 +162,39 @@ msgstr ""
msgid "If you really want blocklists, use --force." msgid "If you really want blocklists, use --force."
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:439 #: util/i386/pc/grub-setup.c:441
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB" msgid "attempting to read the core image `%s' from GRUB"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:440 #: util/i386/pc/grub-setup.c:442
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB again" msgid "attempting to read the core image `%s' from GRUB again"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:498 #: util/i386/pc/grub-setup.c:500
#, c-format #, c-format
msgid "Cannot read `%s' correctly" msgid "Cannot read `%s' correctly"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:511 #: util/i386/pc/grub-setup.c:513
msgid "No terminator in the core image" msgid "No terminator in the core image"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:522 #: util/i386/pc/grub-setup.c:524
msgid "Failed to read the first sector of the core image" msgid "Failed to read the first sector of the core image"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:528 #: util/i386/pc/grub-setup.c:530
msgid "Failed to read the rest sectors of the core image" msgid "Failed to read the rest sectors of the core image"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:547 #: util/i386/pc/grub-setup.c:549
#, c-format #, c-format
msgid "Cannot open `%s'" msgid "Cannot open `%s'"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:589 #: util/i386/pc/grub-setup.c:591
#, c-format #, c-format
msgid "" msgid ""
"Usage: grub-setup [OPTION]... DEVICE\n" "Usage: grub-setup [OPTION]... DEVICE\n"
@ -216,27 +216,27 @@ msgid ""
"Report bugs to <%s>.\n" "Report bugs to <%s>.\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:719 #: util/i386/pc/grub-setup.c:721
#, c-format #, c-format
msgid "No device is specified.\n" msgid "No device is specified.\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:725 #: util/i386/pc/grub-setup.c:727
#, c-format #, c-format
msgid "Unknown extra argument `%s'.\n" msgid "Unknown extra argument `%s'.\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:742 #: util/i386/pc/grub-setup.c:744
#, c-format #, c-format
msgid "Invalid device `%s'.\n" msgid "Invalid device `%s'.\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:755 #: util/i386/pc/grub-setup.c:757
#, c-format #, c-format
msgid "Invalid root device `%s'" msgid "Invalid root device `%s'"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:768 #: util/i386/pc/grub-setup.c:770
msgid "Cannot guess the root device. Specify the option ``--root-device''." msgid "Cannot guess the root device. Specify the option ``--root-device''."
msgstr "" msgstr ""

363
po/id.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: grub 1.97+20091122\n" "Project-Id-Version: grub 1.97+20091122\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-22 11:48+0100\n" "POT-Creation-Date: 2009-11-25 23:57+0100\n"
"PO-Revision-Date: 2009-11-22 20:00+0700\n" "PO-Revision-Date: 2009-11-22 20:00+0700\n"
"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@ -41,7 +41,7 @@ msgstr "besar diskboot.img seharusnya %u bytes"
msgid "Core image is too big (%p > %p)\n" msgid "Core image is too big (%p > %p)\n"
msgstr "Image core terlalu besar (%p >%p)\n" msgstr "Image core terlalu besar (%p >%p)\n"
#: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:587 #: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:589
#, c-format #, c-format
msgid "Try ``%s --help'' for more information.\n" msgid "Try ``%s --help'' for more information.\n"
msgstr "Coba ``%s --help'' untuk informasi lebih lanjut.\n" msgstr "Coba ``%s --help'' untuk informasi lebih lanjut.\n"
@ -72,7 +72,8 @@ msgstr ""
" -p, --prefix=DIR set direktori grub_prefix [baku=%s]\n" " -p, --prefix=DIR set direktori grub_prefix [baku=%s]\n"
" -m, --memdisk=BERKAS tempatkan BERKAS sebagai sebuah image memdisk\n" " -m, --memdisk=BERKAS tempatkan BERKAS sebagai sebuah image memdisk\n"
" -c, --config=BERKAS tempatkan BERKAS sebagai konfigurasi boot\n" " -c, --config=BERKAS tempatkan BERKAS sebagai konfigurasi boot\n"
" -o, --output=BERKAS keluarkan sebuah image yang dihasilkan ke BERKAS [baku=stdout]\n" " -o, --output=BERKAS keluarkan sebuah image yang dihasilkan ke BERKAS "
"[baku=stdout]\n"
" -h, --help tampilkan pesan ini dan keluar\n" " -h, --help tampilkan pesan ini dan keluar\n"
" -V, --version tampilkan informasi versi dan keluar\n" " -V, --version tampilkan informasi versi dan keluar\n"
" -v, --verbose tampilkan informasi secara detail\n" " -v, --verbose tampilkan informasi secara detail\n"
@ -114,86 +115,122 @@ msgstr "Ukuran dari `%s' terlalu besar"
#: util/i386/pc/grub-setup.c:261 #: util/i386/pc/grub-setup.c:261
#, c-format #, c-format
msgid "Unable to identify a filesystem in %s; safety check can't be performed" msgid "Unable to identify a filesystem in %s; safety check can't be performed"
msgstr "Tidak dapat mengidentifikasikan sebuah sistem berkas dalam %s; pemeriksaan keamanan tidak dapat dilakukan" msgstr ""
"Tidak dapat mengidentifikasikan sebuah sistem berkas dalam %s; pemeriksaan "
"keamanan tidak dapat dilakukan"
#: util/i386/pc/grub-setup.c:265 #: util/i386/pc/grub-setup.c:265
#, c-format #, 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)" msgid ""
msgstr "%s sepertinya berisi sebuah sistem berkas %s yang tidak diketahui untuk mereserve ruang untuk boot gaya-DOS. Memasang GRUB disana dapat berakibat KERUSAKAN SISTEM BERKAS jika data berharga dipaksa tulis oleh grub-setup (--skip-fs-probe menonaktifkan pemeriksaan ini, gunakan sesuai resiko anda)" "%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 ""
"%s sepertinya berisi sebuah sistem berkas %s yang tidak diketahui untuk "
"mereserve ruang untuk boot gaya-DOS. Memasang GRUB disana dapat berakibat "
"KERUSAKAN SISTEM BERKAS jika data berharga dipaksa tulis oleh grub-setup (--"
"skip-fs-probe menonaktifkan pemeriksaan ini, gunakan sesuai resiko anda)"
#: util/i386/pc/grub-setup.c:314 #: util/i386/pc/grub-setup.c:314
msgid "No DOS-style partitions found" msgid "No DOS-style partitions found"
msgstr "Tidak ditemukan gaya partisi DOS" msgstr "Tidak ditemukan gaya partisi DOS"
#: util/i386/pc/grub-setup.c:330 util/i386/pc/grub-setup.c:355 #: 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." msgid ""
msgstr "Mencoba memasang GRUB ke sebuah disk yang tidak berpartisi. Ini mungkin bukan ide baik." "Attempting to install GRUB to a partitionless disk. This is a BAD idea."
msgstr ""
"Mencoba memasang GRUB ke sebuah disk yang tidak berpartisi. Ini mungkin "
"bukan ide baik."
#: util/i386/pc/grub-setup.c:336 #: util/i386/pc/grub-setup.c:336
msgid "Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea." msgid ""
msgstr "Mencoba memasang GRUB ke sebuah partisi daripada MBR. Ini mungkin bukan ide baik." "Attempting to install GRUB to a partition instead of the MBR. This is a BAD "
"idea."
msgstr ""
"Mencoba memasang GRUB ke sebuah partisi daripada MBR. Ini mungkin bukan ide "
"baik."
#: util/i386/pc/grub-setup.c:365 #: util/i386/pc/grub-setup.c:365
msgid "This msdos-style partition label has no post-MBR gap; embedding won't be possible!" msgid ""
msgstr "Label partisi gaya msdos ini tidak memiliki post-MBR gap; penempatan tidak memungkinkan!" "This msdos-style partition label has no post-MBR gap; embedding won't be "
"possible!"
msgstr ""
"Label partisi gaya msdos ini tidak memiliki post-MBR gap; penempatan tidak "
"memungkinkan!"
#: util/i386/pc/grub-setup.c:367 #: util/i386/pc/grub-setup.c:367
msgid "This GPT partition label has no BIOS Boot Partition; embedding won't be possible!" msgid ""
msgstr "Label partisi GPT ini tidak memiliki partisi boot BIOS; penempatan tidak memungkinkan!" "This GPT partition label has no BIOS Boot Partition; embedding won't be "
"possible!"
msgstr ""
"Label partisi GPT ini tidak memiliki partisi boot BIOS; penempatan tidak "
"memungkinkan!"
#: util/i386/pc/grub-setup.c:374 #: util/i386/pc/grub-setup.c:374
msgid "Your core.img is unusually large. It won't fit in the embedding area." msgid "Your core.img is unusually large. It won't fit in the embedding area."
msgstr "Besar core.img anda sangat besar. Ini tidak akan masuk dalam area penempatan." msgstr ""
"Besar core.img anda sangat besar. Ini tidak akan masuk dalam area penempatan."
#: util/i386/pc/grub-setup.c:376 #: util/i386/pc/grub-setup.c:376
msgid "Your embedding area is unusually small. core.img won't fit in it." msgid "Your embedding area is unusually small. core.img won't fit in it."
msgstr "Penempatan anda sangat kecil. core.img tidak akan masuk disana." msgstr "Penempatan anda sangat kecil. core.img tidak akan masuk disana."
#: util/i386/pc/grub-setup.c:418 #: 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." msgid ""
msgstr "Penempatan tidak memungkinkan, tetapi ini dibutuhkan ketika perangkat root berada di sebuah array RAID atau volume LVM." "Embedding is not possible, but this is required when the root device is on a "
"RAID array or LVM volume."
msgstr ""
"Penempatan tidak memungkinkan, tetapi ini dibutuhkan ketika perangkat root "
"berada di sebuah array RAID atau volume LVM."
#: util/i386/pc/grub-setup.c:421 #: 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." msgid ""
msgstr "Penempatan tidak memungkinkan. GRUB hanya dapat dipasang di konfigurasi ini dengan menggunakan blocklists. Akan tetapi, blocklists TIDAK DAPAT DIJAGAKAN dan penggunaan ini tidak disarankan." "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 ""
"Penempatan tidak memungkinkan. GRUB hanya dapat dipasang di konfigurasi ini "
"dengan menggunakan blocklists. Akan tetapi, blocklists TIDAK DAPAT DIJAGAKAN "
"dan penggunaan ini tidak disarankan."
#: util/i386/pc/grub-setup.c:425 #: util/i386/pc/grub-setup.c:425
msgid "If you really want blocklists, use --force." msgid "If you really want blocklists, use --force."
msgstr "Jika anda benar benar menginginkan blocklists, gunakan --force." msgstr "Jika anda benar benar menginginkan blocklists, gunakan --force."
#: util/i386/pc/grub-setup.c:439 #: util/i386/pc/grub-setup.c:441
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB" msgid "attempting to read the core image `%s' from GRUB"
msgstr "mencoba untuk membaca image core `%s' dari GRUB" msgstr "mencoba untuk membaca image core `%s' dari GRUB"
#: util/i386/pc/grub-setup.c:440 #: util/i386/pc/grub-setup.c:442
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB again" msgid "attempting to read the core image `%s' from GRUB again"
msgstr "mencoba untuk membaca image core `%s' dari GRUB lagi" msgstr "mencoba untuk membaca image core `%s' dari GRUB lagi"
#: util/i386/pc/grub-setup.c:498 #: util/i386/pc/grub-setup.c:500
#, c-format #, c-format
msgid "Cannot read `%s' correctly" msgid "Cannot read `%s' correctly"
msgstr "Tidak dapat membaca `%s' secara benar" msgstr "Tidak dapat membaca `%s' secara benar"
#: util/i386/pc/grub-setup.c:511 #: util/i386/pc/grub-setup.c:513
msgid "No terminator in the core image" msgid "No terminator in the core image"
msgstr "Tidak ada pengakhir dalam image core" msgstr "Tidak ada pengakhir dalam image core"
#: util/i386/pc/grub-setup.c:522 #: util/i386/pc/grub-setup.c:524
msgid "Failed to read the first sector of the core image" msgid "Failed to read the first sector of the core image"
msgstr "Gagal untuk membaca sektor pertama dari core image" msgstr "Gagal untuk membaca sektor pertama dari core image"
#: util/i386/pc/grub-setup.c:528 #: util/i386/pc/grub-setup.c:530
msgid "Failed to read the rest sectors of the core image" msgid "Failed to read the rest sectors of the core image"
msgstr "Gagal untuk membaca sektor selanjutnya dari image core" msgstr "Gagal untuk membaca sektor selanjutnya dari image core"
#: util/i386/pc/grub-setup.c:547 #: util/i386/pc/grub-setup.c:549
#, c-format #, c-format
msgid "Cannot open `%s'" msgid "Cannot open `%s'"
msgstr "Tidak dapat membuka `%s'" msgstr "Tidak dapat membuka `%s'"
#: util/i386/pc/grub-setup.c:589 #: util/i386/pc/grub-setup.c:591
#, c-format #, c-format
msgid "" msgid ""
"Usage: grub-setup [OPTION]... DEVICE\n" "Usage: grub-setup [OPTION]... DEVICE\n"
@ -225,36 +262,38 @@ msgstr ""
" -m, --device-map=BERKAS gunakan BERKAS sebagai peta perangkat [baku=%s]\n" " -m, --device-map=BERKAS gunakan BERKAS sebagai peta perangkat [baku=%s]\n"
" -r, --root-device=DEV gunakan DEV sebagai perangkat root [baku=ditebak]\n" " -r, --root-device=DEV gunakan DEV sebagai perangkat root [baku=ditebak]\n"
" -f, --force pasang walaupun masalah terdeteksi\n" " -f, --force pasang walaupun masalah terdeteksi\n"
" -s, --skip-fs-probe jangan periksa untuk sistem berkas dalam PERANGKAT\n" " -s, --skip-fs-probe jangan periksa untuk sistem berkas dalam "
"PERANGKAT\n"
" -h, --help tampilkan pesan bantuan ini dan keluar\n" " -h, --help tampilkan pesan bantuan ini dan keluar\n"
" -V, --version tampilkan informasi versi dan keluar\n" " -V, --version tampilkan informasi versi dan keluar\n"
" -v, --verbose tampilkan informasi secara detail\n" " -v, --verbose tampilkan informasi secara detail\n"
"\n" "\n"
"Laporkan bugs ke <%s>.\n" "Laporkan bugs ke <%s>.\n"
#: util/i386/pc/grub-setup.c:719 #: util/i386/pc/grub-setup.c:721
#, c-format #, c-format
msgid "No device is specified.\n" msgid "No device is specified.\n"
msgstr "Perangkat tidak dispesifikasikan.\n" msgstr "Perangkat tidak dispesifikasikan.\n"
#: util/i386/pc/grub-setup.c:725 #: util/i386/pc/grub-setup.c:727
#, c-format #, c-format
msgid "Unknown extra argument `%s'.\n" msgid "Unknown extra argument `%s'.\n"
msgstr "Argumen ekstra `%s' tidak diketahui.\n" msgstr "Argumen ekstra `%s' tidak diketahui.\n"
#: util/i386/pc/grub-setup.c:742 #: util/i386/pc/grub-setup.c:744
#, c-format #, c-format
msgid "Invalid device `%s'.\n" msgid "Invalid device `%s'.\n"
msgstr "Perangkat `%s' tidak valid.\n" msgstr "Perangkat `%s' tidak valid.\n"
#: util/i386/pc/grub-setup.c:755 #: util/i386/pc/grub-setup.c:757
#, c-format #, c-format
msgid "Invalid root device `%s'" msgid "Invalid root device `%s'"
msgstr "Perangkat root `%s' tidak valid" msgstr "Perangkat root `%s' tidak valid"
#: util/i386/pc/grub-setup.c:768 #: util/i386/pc/grub-setup.c:770
msgid "Cannot guess the root device. Specify the option ``--root-device''." msgid "Cannot guess the root device. Specify the option ``--root-device''."
msgstr "Tidak dapat menebak perangkat root. Spesifikasikan pilihan ``--root-device''." msgstr ""
"Tidak dapat menebak perangkat root. Spesifikasikan pilihan ``--root-device''."
#: util/mkisofs/eltorito.c:96 #: util/mkisofs/eltorito.c:96
#, c-format #, c-format
@ -269,7 +308,9 @@ msgstr "Mohon periksa berkas berikut: %s.\n"
#: util/mkisofs/eltorito.c:98 #: util/mkisofs/eltorito.c:98
#, c-format #, c-format
msgid "This file must be removed before a bootable CD can be done.\n" msgid "This file must be removed before a bootable CD can be done.\n"
msgstr "Berkas ini mungkin telah terhapus sebelum sebuah CD bootable dapat dilakukan.\n" msgstr ""
"Berkas ini mungkin telah terhapus sebelum sebuah CD bootable dapat "
"dilakukan.\n"
#: util/mkisofs/eltorito.c:110 #: util/mkisofs/eltorito.c:110
#, c-format #, c-format
@ -360,7 +401,9 @@ msgstr "Error menulis ke boot image (%s)"
#: util/mkisofs/joliet.c:359 util/mkisofs/write.c:981 #: util/mkisofs/joliet.c:359 util/mkisofs/write.c:981
#, c-format #, c-format
msgid "Unable to generate sane path tables - too many directories (%d)\n" msgid "Unable to generate sane path tables - too many directories (%d)\n"
msgstr "Tidak dapat menghasilkan tabel jalur yang masuk akal - terlalu banyak direktori (%d)\n" msgstr ""
"Tidak dapat menghasilkan tabel jalur yang masuk akal - terlalu banyak "
"direktori (%d)\n"
#: util/mkisofs/joliet.c:398 util/mkisofs/write.c:1017 #: util/mkisofs/joliet.c:398 util/mkisofs/write.c:1017
#, c-format #, c-format
@ -392,6 +435,208 @@ msgstr "Fatal goof - tidak dapat menemukan lokasi direktori\n"
msgid "Unexpected joliet directory length %d %d %s\n" msgid "Unexpected joliet directory length %d %d %s\n"
msgstr "Panjang direktori joliet tidak terduga %d %d %s\n" msgstr "Panjang direktori joliet tidak terduga %d %d %s\n"
#: util/mkisofs/mkisofs.c:203
msgid "Process all files (don't skip backup files)"
msgstr ""
#: util/mkisofs/mkisofs.c:205
#, fuzzy
msgid "Set Abstract filename"
msgstr "String nama berkas abstrak terlalu panjang\n"
#: util/mkisofs/mkisofs.c:207
msgid "Set Application ID"
msgstr ""
#: util/mkisofs/mkisofs.c:209
#, fuzzy
msgid "Set Bibliographic filename"
msgstr "String nama berkas bibliographic terlalu panjang\n"
#: util/mkisofs/mkisofs.c:211
#, fuzzy
msgid "Set Copyright filename"
msgstr "String nama berkas Hak Cipta terlalu panjang\n"
#: util/mkisofs/mkisofs.c:213
msgid "Set El Torito boot image name"
msgstr ""
#: util/mkisofs/mkisofs.c:215
#, fuzzy
msgid "Set El Torito boot catalog name"
msgstr "Error menulis ke katalog boot"
#: util/mkisofs/mkisofs.c:217
msgid "Patch Boot Info Table in El Torito boot image"
msgstr ""
#: util/mkisofs/mkisofs.c:219
msgid "Dummy option for backward compatibility"
msgstr ""
#: util/mkisofs/mkisofs.c:221
msgid "Enable floppy drive emulation for El Torito"
msgstr ""
#: util/mkisofs/mkisofs.c:223
msgid "Magic parameters from cdrecord"
msgstr ""
#: util/mkisofs/mkisofs.c:225
msgid "Omit trailing periods from filenames"
msgstr ""
#: util/mkisofs/mkisofs.c:227
#, fuzzy
msgid "Disable deep directory relocation"
msgstr "Fatal goof - tidak dapat menemukan lokasi direktori\n"
#: util/mkisofs/mkisofs.c:229
msgid "Follow symbolic links"
msgstr ""
#: util/mkisofs/mkisofs.c:231 util/mkisofs/mkisofs.c:233
msgid "Print option help"
msgstr ""
#: util/mkisofs/mkisofs.c:235
msgid "Print version information and exit"
msgstr ""
#: util/mkisofs/mkisofs.c:237
msgid "Hide ISO9660/RR file"
msgstr ""
#: util/mkisofs/mkisofs.c:239
msgid "Hide Joliet file"
msgstr ""
#: util/mkisofs/mkisofs.c:241
#, fuzzy
msgid "No longer supported"
msgstr "pilihan -i tidak lagi didukung.\n"
#: util/mkisofs/mkisofs.c:243
msgid "Generate Joliet directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:245
msgid "Allow full 32 character filenames for iso9660 names"
msgstr ""
#: util/mkisofs/mkisofs.c:247
msgid "Allow iso9660 filenames to start with '.'"
msgstr ""
#: util/mkisofs/mkisofs.c:249
#, fuzzy
msgid "Re-direct messages to LOG_FILE"
msgstr "menredireksikan seluruh pesan ke %s\n"
#: util/mkisofs/mkisofs.c:251
msgid "Exclude file name"
msgstr ""
#: util/mkisofs/mkisofs.c:253
#, fuzzy
msgid "Set path to previous session to merge"
msgstr "Tidak dapat membuka sesi image sebelumnya %s\n"
#: util/mkisofs/mkisofs.c:255
msgid "Omit version number from iso9660 filename"
msgstr ""
#: util/mkisofs/mkisofs.c:257
msgid "Inhibit splitting symlink components"
msgstr ""
#: util/mkisofs/mkisofs.c:259
msgid "Inhibit splitting symlink fields"
msgstr ""
#: util/mkisofs/mkisofs.c:261
msgid "Set output file name"
msgstr ""
#: util/mkisofs/mkisofs.c:263
msgid "Set Volume preparer"
msgstr ""
#: util/mkisofs/mkisofs.c:265
msgid "Print estimated filesystem size and exit"
msgstr ""
#: util/mkisofs/mkisofs.c:267
msgid "Set Volume publisher"
msgstr ""
#: util/mkisofs/mkisofs.c:269
msgid "Run quietly"
msgstr ""
#: util/mkisofs/mkisofs.c:271
msgid "Generate rationalized Rock Ridge directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:273
msgid "Generate Rock Ridge directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:275
msgid "Split output into files of approx. 1GB size"
msgstr ""
#: util/mkisofs/mkisofs.c:277
msgid "Set System ID"
msgstr ""
#: util/mkisofs/mkisofs.c:279
msgid ""
"Generate translation tables for systems that don't understand long filenames"
msgstr ""
#: util/mkisofs/mkisofs.c:281
msgid "Verbose"
msgstr ""
#: util/mkisofs/mkisofs.c:283
msgid "Set Volume ID"
msgstr ""
#: util/mkisofs/mkisofs.c:285
msgid "Set Volume set ID"
msgstr ""
#: util/mkisofs/mkisofs.c:287
msgid "Set Volume set size"
msgstr ""
#: util/mkisofs/mkisofs.c:289
#, fuzzy
msgid "Set Volume set sequence number"
msgstr "Set urutan nomor volume terlalu besar\n"
#: util/mkisofs/mkisofs.c:291
msgid "Exclude file name (deprecated)"
msgstr ""
#: util/mkisofs/mkisofs.c:297
msgid "Override creation date"
msgstr ""
#: util/mkisofs/mkisofs.c:299
msgid "Override modification date"
msgstr ""
#: util/mkisofs/mkisofs.c:301
msgid "Override expiration date"
msgstr ""
#: util/mkisofs/mkisofs.c:303
msgid "Override effective date"
msgstr ""
#: util/mkisofs/mkisofs.c:373 #: util/mkisofs/mkisofs.c:373
#, c-format #, c-format
msgid "Using \"%s\"\n" msgid "Using \"%s\"\n"
@ -509,12 +754,16 @@ msgstr "Peringatan: setrlimit"
#: util/mkisofs/mkisofs.c:978 #: util/mkisofs/mkisofs.c:978
#, c-format #, c-format
msgid "Multisession usage bug: Must specify -C if -M is used.\n" msgid "Multisession usage bug: Must specify -C if -M is used.\n"
msgstr "Bug penggunaan multi sesi: Harus menspesifikasikan -C jika -M digunakan.\n" msgstr ""
"Bug penggunaan multi sesi: Harus menspesifikasikan -C jika -M digunakan.\n"
#: util/mkisofs/mkisofs.c:984 #: util/mkisofs/mkisofs.c:984
#, c-format #, c-format
msgid "Warning: -C specified without -M: old session data will not be merged.\n" msgid ""
msgstr "Peringatan: -C dispesifikasikan tanpa -M: data sesi lama tidak akan digabungkan.\n" "Warning: -C specified without -M: old session data will not be merged.\n"
msgstr ""
"Peringatan: -C dispesifikasikan tanpa -M: data sesi lama tidak akan "
"digabungkan.\n"
#: util/mkisofs/mkisofs.c:1023 #: util/mkisofs/mkisofs.c:1023
#, c-format #, c-format
@ -574,8 +823,13 @@ msgstr "**Atribut versi RR buruk"
#: util/mkisofs/multi.c:546 #: util/mkisofs/multi.c:546
#, c-format #, 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" msgid ""
msgstr "Peringatan: Bukan Rock Ridge (-R) ataupun TRANS.TBL (-T) nama terjemahan ditemukan dalam sesi sebelumnya. ISO (8.3) nama berkas yang telah digunakan.\n" "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 ""
"Peringatan: Bukan Rock Ridge (-R) ataupun TRANS.TBL (-T) nama terjemahan "
"ditemukan dalam sesi sebelumnya. ISO (8.3) nama berkas yang telah "
"digunakan.\n"
#: util/mkisofs/multi.c:764 #: util/mkisofs/multi.c:764
#, c-format #, c-format
@ -593,12 +847,15 @@ msgstr "Parameter cdwrite salah format\n"
#: util/mkisofs/rock.c:309 #: util/mkisofs/rock.c:309
#, c-format #, c-format
msgid "symbolic link ``%s'' to long for one SL System Use Field, splitting" msgid "symbolic link ``%s'' to long for one SL System Use Field, splitting"
msgstr "link simbolik ``%s'' terlalu panjang untuk satu SL Sistem Menggunakan Field, dipisahkan" msgstr ""
"link simbolik ``%s'' terlalu panjang untuk satu SL Sistem Menggunakan "
"Field, dipisahkan"
#: util/mkisofs/rock.c:517 #: util/mkisofs/rock.c:517
#, c-format #, c-format
msgid "Unable to insert transparent compressed file - name conflict\n" msgid "Unable to insert transparent compressed file - name conflict\n"
msgstr "Tidak dapat memasukan berkas terkompress secara transparan - konflik nama\n" msgstr ""
"Tidak dapat memasukan berkas terkompress secara transparan - konflik nama\n"
#: util/mkisofs/rock.c:591 #: util/mkisofs/rock.c:591
msgid "Extension record too long\n" msgid "Extension record too long\n"
@ -674,7 +931,8 @@ msgstr "Tidak ada atau tidak dapat diakses: %s\n"
#: util/mkisofs/tree.c:997 util/mkisofs/tree.c:1103 #: util/mkisofs/tree.c:997 util/mkisofs/tree.c:1103
#, c-format #, c-format
msgid "Unable to stat file %s - ignoring and continuing.\n" msgid "Unable to stat file %s - ignoring and continuing.\n"
msgstr "Tidak dapat memperoleh statistik berkas %s - mengabaikan dan melanjutkan.\n" msgstr ""
"Tidak dapat memperoleh statistik berkas %s - mengabaikan dan melanjutkan.\n"
#: util/mkisofs/tree.c:1003 #: util/mkisofs/tree.c:1003
#, c-format #, c-format
@ -791,8 +1049,11 @@ msgstr "Total ekstensi yang sebenarnya tertulis = %llu\n"
#: util/mkisofs/write.c:1154 #: util/mkisofs/write.c:1154
#, c-format #, c-format
msgid "Number of extents written different than what was predicted. Please fix.\n" msgid ""
msgstr "Jumlah dari ekstensi yang ditulis berbeda dari apa yang direncanakan. Mohon betulkan.\n" "Number of extents written different than what was predicted. Please fix.\n"
msgstr ""
"Jumlah dari ekstensi yang ditulis berbeda dari apa yang direncanakan. Mohon "
"betulkan.\n"
#: util/mkisofs/write.c:1155 #: util/mkisofs/write.c:1155
#, c-format #, c-format
@ -819,6 +1080,13 @@ msgstr "Total bytes direktori: %d\n"
msgid "Path table size(bytes): %d\n" msgid "Path table size(bytes): %d\n"
msgstr "Ukuran tabel jalur(bytes): %d\n" msgstr "Ukuran tabel jalur(bytes): %d\n"
#: normal/menu_text.c:97
#, c-format
msgid ""
"\n"
" Use the %C and %C keys to select which entry is highlighted.\n"
msgstr ""
#: util/grub.d/10_kfreebsd.in:40 #: util/grub.d/10_kfreebsd.in:40
msgid "%s, with kFreeBSD %s" msgid "%s, with kFreeBSD %s"
msgstr "%s, dengan kFreeBSD %s" msgstr "%s, dengan kFreeBSD %s"
@ -858,7 +1126,8 @@ msgstr "%s, dengan Linux %s"
#~ msgid "the core image will be embedded at sector 0x%llx" #~ msgid "the core image will be embedded at sector 0x%llx"
#~ msgstr "core image akan di ditempatkan di sektor 0x%llx" #~ msgstr "core image akan di ditempatkan di sektor 0x%llx"
#~ msgid "succeeded in opening the core image but the size is different (%d != %d)" #~ msgid ""
#~ "succeeded in opening the core image but the size is different (%d != %d)"
#~ msgstr "sukses dalam membuka image core tetapi ukurannya berbeda (%d != %d)" #~ msgstr "sukses dalam membuka image core tetapi ukurannya berbeda (%d != %d)"
#~ msgid "succeeded in opening the core image but cannot read %d bytes" #~ msgid "succeeded in opening the core image but cannot read %d bytes"

275
po/zh_CN.po
View file

@ -8,10 +8,11 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: grub 1.97+20091122\n" "Project-Id-Version: grub 1.97+20091122\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-22 11:48+0100\n" "POT-Creation-Date: 2009-11-25 23:57+0100\n"
"PO-Revision-Date: 2009-11-23 18:36+0800\n" "PO-Revision-Date: 2009-11-23 18:36+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists.sourceforge.net>\n" "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
"sourceforge.net>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"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"
@ -42,7 +43,7 @@ msgstr "diskboot.img 的大小必须为 %u 字节"
msgid "Core image is too big (%p > %p)\n" msgid "Core image is too big (%p > %p)\n"
msgstr "核心映像太大(%p > %p)\n" msgstr "核心映像太大(%p > %p)\n"
#: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:587 #: util/i386/pc/grub-mkimage.c:321 util/i386/pc/grub-setup.c:589
#, c-format #, c-format
msgid "Try ``%s --help'' for more information.\n" msgid "Try ``%s --help'' for more information.\n"
msgstr "请尝试运行 ``%s --help'' 以获得更多信息。\n" msgstr "请尝试运行 ``%s --help'' 以获得更多信息。\n"
@ -105,7 +106,11 @@ msgstr ""
#: util/i386/pc/grub-setup.c:265 #: util/i386/pc/grub-setup.c:265
#, c-format #, 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)" 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 "" msgstr ""
#: util/i386/pc/grub-setup.c:314 #: util/i386/pc/grub-setup.c:314
@ -113,19 +118,26 @@ msgid "No DOS-style partitions found"
msgstr "未找到 DOS 类型分区" msgstr "未找到 DOS 类型分区"
#: util/i386/pc/grub-setup.c:330 util/i386/pc/grub-setup.c:355 #: 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." msgid ""
"Attempting to install GRUB to a partitionless disk. This is a BAD idea."
msgstr "正在试图安装 GRUB 到未分区的磁盘。 这是一个坏主意。" msgstr "正在试图安装 GRUB 到未分区的磁盘。 这是一个坏主意。"
#: util/i386/pc/grub-setup.c:336 #: util/i386/pc/grub-setup.c:336
msgid "Attempting to install GRUB to a partition instead of the MBR. This is a BAD idea." msgid ""
"Attempting to install GRUB to a partition instead of the MBR. This is a BAD "
"idea."
msgstr "正在试图安装 GRUB 到分区而非 MBR。 这是一个坏主意。" msgstr "正在试图安装 GRUB 到分区而非 MBR。 这是一个坏主意。"
#: util/i386/pc/grub-setup.c:365 #: util/i386/pc/grub-setup.c:365
msgid "This msdos-style partition label has no post-MBR gap; embedding won't be possible!" msgid ""
"This msdos-style partition label has no post-MBR gap; embedding won't be "
"possible!"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:367 #: util/i386/pc/grub-setup.c:367
msgid "This GPT partition label has no BIOS Boot Partition; embedding won't be possible!" msgid ""
"This GPT partition label has no BIOS Boot Partition; embedding won't be "
"possible!"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:374 #: util/i386/pc/grub-setup.c:374
@ -137,50 +149,55 @@ msgid "Your embedding area is unusually small. core.img won't fit in it."
msgstr "您的嵌入式环境超乎寻常的小。core.img 无法适用于此处。" msgstr "您的嵌入式环境超乎寻常的小。core.img 无法适用于此处。"
#: util/i386/pc/grub-setup.c:418 #: 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." msgid ""
"Embedding is not possible, but this is required when the root device is on a "
"RAID array or LVM volume."
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:421 #: 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." 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 "" msgstr ""
#: util/i386/pc/grub-setup.c:425 #: util/i386/pc/grub-setup.c:425
msgid "If you really want blocklists, use --force." msgid "If you really want blocklists, use --force."
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:439 #: util/i386/pc/grub-setup.c:441
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB" msgid "attempting to read the core image `%s' from GRUB"
msgstr "正在尝试从 GRUB 读取核心映像 `%s'" msgstr "正在尝试从 GRUB 读取核心映像 `%s'"
#: util/i386/pc/grub-setup.c:440 #: util/i386/pc/grub-setup.c:442
#, c-format #, c-format
msgid "attempting to read the core image `%s' from GRUB again" msgid "attempting to read the core image `%s' from GRUB again"
msgstr "正在再次尝试从 GRUB 读取核心映像 `%s'" msgstr "正在再次尝试从 GRUB 读取核心映像 `%s'"
#: util/i386/pc/grub-setup.c:498 #: util/i386/pc/grub-setup.c:500
#, c-format #, c-format
msgid "Cannot read `%s' correctly" msgid "Cannot read `%s' correctly"
msgstr "无法正确读取 `%s'" msgstr "无法正确读取 `%s'"
#: util/i386/pc/grub-setup.c:511 #: util/i386/pc/grub-setup.c:513
msgid "No terminator in the core image" msgid "No terminator in the core image"
msgstr "核心映像中没有终止符" msgstr "核心映像中没有终止符"
#: util/i386/pc/grub-setup.c:522 #: util/i386/pc/grub-setup.c:524
msgid "Failed to read the first sector of the core image" msgid "Failed to read the first sector of the core image"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:528 #: util/i386/pc/grub-setup.c:530
msgid "Failed to read the rest sectors of the core image" msgid "Failed to read the rest sectors of the core image"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:547 #: util/i386/pc/grub-setup.c:549
#, c-format #, c-format
msgid "Cannot open `%s'" msgid "Cannot open `%s'"
msgstr "无法打开 `%s'" msgstr "无法打开 `%s'"
#: util/i386/pc/grub-setup.c:589 #: util/i386/pc/grub-setup.c:591
#, c-format #, c-format
msgid "" msgid ""
"Usage: grub-setup [OPTION]... DEVICE\n" "Usage: grub-setup [OPTION]... DEVICE\n"
@ -202,27 +219,27 @@ msgid ""
"Report bugs to <%s>.\n" "Report bugs to <%s>.\n"
msgstr "" msgstr ""
#: util/i386/pc/grub-setup.c:719 #: util/i386/pc/grub-setup.c:721
#, c-format #, c-format
msgid "No device is specified.\n" msgid "No device is specified.\n"
msgstr "没有指定设备。\n" msgstr "没有指定设备。\n"
#: util/i386/pc/grub-setup.c:725 #: util/i386/pc/grub-setup.c:727
#, c-format #, c-format
msgid "Unknown extra argument `%s'.\n" msgid "Unknown extra argument `%s'.\n"
msgstr "未知的额外参数 `%s'。\n" msgstr "未知的额外参数 `%s'。\n"
#: util/i386/pc/grub-setup.c:742 #: util/i386/pc/grub-setup.c:744
#, c-format #, c-format
msgid "Invalid device `%s'.\n" msgid "Invalid device `%s'.\n"
msgstr "无效的设备 `%s'。\n" msgstr "无效的设备 `%s'。\n"
#: util/i386/pc/grub-setup.c:755 #: util/i386/pc/grub-setup.c:757
#, c-format #, c-format
msgid "Invalid root device `%s'" msgid "Invalid root device `%s'"
msgstr "无效的根设备 `%s'" msgstr "无效的根设备 `%s'"
#: util/i386/pc/grub-setup.c:768 #: util/i386/pc/grub-setup.c:770
msgid "Cannot guess the root device. Specify the option ``--root-device''." msgid "Cannot guess the root device. Specify the option ``--root-device''."
msgstr "无法猜测根设备。请使用 ``--root-device'' 选项指定。" msgstr "无法猜测根设备。请使用 ``--root-device'' 选项指定。"
@ -362,6 +379,201 @@ msgstr ""
msgid "Unexpected joliet directory length %d %d %s\n" msgid "Unexpected joliet directory length %d %d %s\n"
msgstr "" msgstr ""
#: util/mkisofs/mkisofs.c:203
msgid "Process all files (don't skip backup files)"
msgstr ""
#: util/mkisofs/mkisofs.c:205
msgid "Set Abstract filename"
msgstr ""
#: util/mkisofs/mkisofs.c:207
msgid "Set Application ID"
msgstr ""
#: util/mkisofs/mkisofs.c:209
msgid "Set Bibliographic filename"
msgstr ""
#: util/mkisofs/mkisofs.c:211
msgid "Set Copyright filename"
msgstr ""
#: util/mkisofs/mkisofs.c:213
msgid "Set El Torito boot image name"
msgstr ""
#: util/mkisofs/mkisofs.c:215
msgid "Set El Torito boot catalog name"
msgstr ""
#: util/mkisofs/mkisofs.c:217
msgid "Patch Boot Info Table in El Torito boot image"
msgstr ""
#: util/mkisofs/mkisofs.c:219
msgid "Dummy option for backward compatibility"
msgstr ""
#: util/mkisofs/mkisofs.c:221
msgid "Enable floppy drive emulation for El Torito"
msgstr ""
#: util/mkisofs/mkisofs.c:223
msgid "Magic parameters from cdrecord"
msgstr ""
#: util/mkisofs/mkisofs.c:225
msgid "Omit trailing periods from filenames"
msgstr ""
#: util/mkisofs/mkisofs.c:227
msgid "Disable deep directory relocation"
msgstr ""
#: util/mkisofs/mkisofs.c:229
msgid "Follow symbolic links"
msgstr ""
#: util/mkisofs/mkisofs.c:231 util/mkisofs/mkisofs.c:233
msgid "Print option help"
msgstr ""
#: util/mkisofs/mkisofs.c:235
msgid "Print version information and exit"
msgstr ""
#: util/mkisofs/mkisofs.c:237
msgid "Hide ISO9660/RR file"
msgstr ""
#: util/mkisofs/mkisofs.c:239
msgid "Hide Joliet file"
msgstr ""
#: util/mkisofs/mkisofs.c:241
#, fuzzy
msgid "No longer supported"
msgstr "-i 选项已不再被支持。\n"
#: util/mkisofs/mkisofs.c:243
msgid "Generate Joliet directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:245
msgid "Allow full 32 character filenames for iso9660 names"
msgstr ""
#: util/mkisofs/mkisofs.c:247
msgid "Allow iso9660 filenames to start with '.'"
msgstr ""
#: util/mkisofs/mkisofs.c:249
msgid "Re-direct messages to LOG_FILE"
msgstr ""
#: util/mkisofs/mkisofs.c:251
msgid "Exclude file name"
msgstr ""
#: util/mkisofs/mkisofs.c:253
#, fuzzy
msgid "Set path to previous session to merge"
msgstr "无法打开上一会话使用的映像 %s\n"
#: util/mkisofs/mkisofs.c:255
msgid "Omit version number from iso9660 filename"
msgstr ""
#: util/mkisofs/mkisofs.c:257
msgid "Inhibit splitting symlink components"
msgstr ""
#: util/mkisofs/mkisofs.c:259
msgid "Inhibit splitting symlink fields"
msgstr ""
#: util/mkisofs/mkisofs.c:261
msgid "Set output file name"
msgstr ""
#: util/mkisofs/mkisofs.c:263
msgid "Set Volume preparer"
msgstr ""
#: util/mkisofs/mkisofs.c:265
msgid "Print estimated filesystem size and exit"
msgstr ""
#: util/mkisofs/mkisofs.c:267
msgid "Set Volume publisher"
msgstr ""
#: util/mkisofs/mkisofs.c:269
msgid "Run quietly"
msgstr ""
#: util/mkisofs/mkisofs.c:271
msgid "Generate rationalized Rock Ridge directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:273
msgid "Generate Rock Ridge directory information"
msgstr ""
#: util/mkisofs/mkisofs.c:275
msgid "Split output into files of approx. 1GB size"
msgstr ""
#: util/mkisofs/mkisofs.c:277
msgid "Set System ID"
msgstr ""
#: util/mkisofs/mkisofs.c:279
msgid ""
"Generate translation tables for systems that don't understand long filenames"
msgstr ""
#: util/mkisofs/mkisofs.c:281
msgid "Verbose"
msgstr ""
#: util/mkisofs/mkisofs.c:283
msgid "Set Volume ID"
msgstr ""
#: util/mkisofs/mkisofs.c:285
msgid "Set Volume set ID"
msgstr ""
#: util/mkisofs/mkisofs.c:287
msgid "Set Volume set size"
msgstr ""
#: util/mkisofs/mkisofs.c:289
msgid "Set Volume set sequence number"
msgstr ""
#: util/mkisofs/mkisofs.c:291
msgid "Exclude file name (deprecated)"
msgstr ""
#: util/mkisofs/mkisofs.c:297
msgid "Override creation date"
msgstr ""
#: util/mkisofs/mkisofs.c:299
msgid "Override modification date"
msgstr ""
#: util/mkisofs/mkisofs.c:301
msgid "Override expiration date"
msgstr ""
#: util/mkisofs/mkisofs.c:303
msgid "Override effective date"
msgstr ""
#: util/mkisofs/mkisofs.c:373 #: util/mkisofs/mkisofs.c:373
#, c-format #, c-format
msgid "Using \"%s\"\n" msgid "Using \"%s\"\n"
@ -483,7 +695,8 @@ msgstr ""
#: util/mkisofs/mkisofs.c:984 #: util/mkisofs/mkisofs.c:984
#, c-format #, c-format
msgid "Warning: -C specified without -M: old session data will not be merged.\n" msgid ""
"Warning: -C specified without -M: old session data will not be merged.\n"
msgstr "" msgstr ""
#: util/mkisofs/mkisofs.c:1023 #: util/mkisofs/mkisofs.c:1023
@ -544,7 +757,9 @@ msgstr ""
#: util/mkisofs/multi.c:546 #: util/mkisofs/multi.c:546
#, c-format #, 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" 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 "" msgstr ""
#: util/mkisofs/multi.c:764 #: util/mkisofs/multi.c:764
@ -761,7 +976,8 @@ msgstr ""
#: util/mkisofs/write.c:1154 #: util/mkisofs/write.c:1154
#, c-format #, c-format
msgid "Number of extents written different than what was predicted. Please fix.\n" msgid ""
"Number of extents written different than what was predicted. Please fix.\n"
msgstr "" msgstr ""
#: util/mkisofs/write.c:1155 #: util/mkisofs/write.c:1155
@ -789,6 +1005,13 @@ msgstr ""
msgid "Path table size(bytes): %d\n" msgid "Path table size(bytes): %d\n"
msgstr "" msgstr ""
#: normal/menu_text.c:97
#, c-format
msgid ""
"\n"
" Use the %C and %C keys to select which entry is highlighted.\n"
msgstr ""
#: util/grub.d/10_kfreebsd.in:40 #: util/grub.d/10_kfreebsd.in:40
msgid "%s, with kFreeBSD %s" msgid "%s, with kFreeBSD %s"
msgstr "" msgstr ""

16
util/elf/grub-mkimage.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2004,2005,2006,2007,2008 Free Software Foundation, Inc. * Copyright (C) 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
@ -31,6 +31,9 @@
#include <grub/util/resolve.h> #include <grub/util/resolve.h>
#include <grub/kernel.h> #include <grub/kernel.h>
#include <grub/cpu/kernel.h> #include <grub/cpu/kernel.h>
#include <grub/i18n.h>
#include "progname.h"
#define GRUB_IEEE1275_NOTE_NAME "PowerPC" #define GRUB_IEEE1275_NOTE_NAME "PowerPC"
#define GRUB_IEEE1275_NOTE_TYPE 0x1275 #define GRUB_IEEE1275_NOTE_TYPE 0x1275
@ -325,10 +328,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\ Usage: %s -o FILE [OPTION]... [MODULES]\n\
\n\ \n\
Make a bootable image of GRUB.\n\ Make a bootable image of GRUB.\n\
\n\ \n\
@ -342,7 +345,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, PACKAGE_BUGREPORT); ", program_name, GRUB_LIBDIR, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -357,7 +360,10 @@ main (int argc, char *argv[])
char *memdisk = NULL; char *memdisk = NULL;
int chrp = 0; int chrp = 0;
progname = "grub-mkimage"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
while (1) while (1)
{ {

10
util/grub-editenv.c
View file

@ -22,6 +22,7 @@
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/lib/envblk.h> #include <grub/lib/envblk.h>
#include <grub/handler.h> #include <grub/handler.h>
#include <grub/i18n.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -29,6 +30,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include "progname.h"
#define DEFAULT_ENVBLK_SIZE 1024 #define DEFAULT_ENVBLK_SIZE 1024
void void
@ -252,7 +255,10 @@ main (int argc, char *argv[])
char *filename; char *filename;
char *command; char *command;
progname = "grub-editenv"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -269,7 +275,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

18
util/grub-emu.c
View file

@ -1,6 +1,6 @@
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. * Copyright (C) 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
@ -36,19 +36,22 @@
#include <grub/util/getroot.h> #include <grub/util/getroot.h>
#include <grub/env.h> #include <grub/env.h>
#include <grub/partition.h> #include <grub/partition.h>
#include <grub/i18n.h>
#include <grub_emu_init.h> #include <grub_emu_init.h>
#include "progname.h"
/* Used for going back to the main function. */ /* Used for going back to the main function. */
static jmp_buf main_env; static jmp_buf main_env;
/* Store the prefix specified by an argument. */ /* Store the prefix specified by an argument. */
static char *prefix = 0; static char *prefix = NULL;
grub_addr_t grub_addr_t
grub_arch_modules_addr (void) grub_arch_modules_addr (void)
{ {
return 0; return NULL;
} }
grub_err_t grub_err_t
@ -155,7 +158,10 @@ main (int argc, char *argv[])
volatile int hold = 0; volatile int hold = 0;
int opt; int opt;
progname = "grub-emu"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
while ((opt = getopt_long (argc, argv, "r:d:m:vH:hV", options, 0)) != -1) while ((opt = getopt_long (argc, argv, "r:d:m:vH:hV", options, 0)) != -1)
switch (opt) switch (opt)
@ -178,7 +184,7 @@ main (int argc, char *argv[])
case 'h': case 'h':
return usage (0); return usage (0);
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
default: default:
return usage (1); return usage (1);
@ -193,7 +199,7 @@ main (int argc, char *argv[])
/* Wait until the ARGS.HOLD variable is cleared by an attached debugger. */ /* Wait until the ARGS.HOLD variable is cleared by an attached debugger. */
if (hold && verbosity > 0) if (hold && verbosity > 0)
printf ("Run \"gdb %s %d\", and set ARGS.HOLD to zero.\n", printf ("Run \"gdb %s %d\", and set ARGS.HOLD to zero.\n",
progname, (int) getpid ()); program_name, (int) getpid ());
while (hold) while (hold)
{ {
if (hold > 0) if (hold > 0)

20
util/grub-fstest.c
View file

@ -1,7 +1,7 @@
/* grub-fstest.c - debug tool for filesystem driver */ /* grub-fstest.c - debug tool for filesystem driver */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 Free Software Foundation, Inc. * Copyright (C) 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
@ -31,6 +31,7 @@
#include <grub/lib/hexdump.h> #include <grub/lib/hexdump.h>
#include <grub/lib/crc.h> #include <grub/lib/crc.h>
#include <grub/command.h> #include <grub/command.h>
#include <grub/i18n.h>
#include <grub_fstest_init.h> #include <grub_fstest_init.h>
@ -40,6 +41,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#include "progname.h"
void void
grub_putchar (int c) grub_putchar (int c)
{ {
@ -346,10 +349,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-fstest --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-fstest [OPTION]... IMAGE_PATH COMMANDS\n\ Usage: %s [OPTION]... IMAGE_PATH COMMANDS\n\
\n\ \n\
Debug tool for filesystem driver.\n\ Debug tool for filesystem driver.\n\
\nCommands:\n\ \nCommands:\n\
@ -369,7 +372,7 @@ Debug tool for filesystem driver.\n\
-V, --version print version information and exit\n\ -V, --version print version information and exit\n\
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n", PACKAGE_BUGREPORT); Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -377,10 +380,13 @@ Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
char *debug_str = 0, *root = 0, *default_root, *alloc_root; char *debug_str = NULL, *root = NULL, *default_root, *alloc_root;
int i, cmd, num_opts, image_index, num_disks = 1; int i, cmd, num_opts, image_index, num_disks = 1;
progname = "grub-fstest"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Find the first non option entry. */ /* Find the first non option entry. */
for (num_opts = 1; num_opts < argc; num_opts++) for (num_opts = 1; num_opts < argc; num_opts++)
@ -442,7 +448,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

18
util/grub-mkdevicemap.c
View file

@ -1,7 +1,7 @@
/* grub-mkdevicemap.c - make a device map file automatically */ /* grub-mkdevicemap.c - make a device map file automatically */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008 Free Software Foundation, Inc. * Copyright (C) 1999,2000,2001,2002,2003,2004,2005,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
@ -31,10 +31,13 @@
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/util/deviceiter.h> #include <grub/util/deviceiter.h>
#include <grub/i18n.h>
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include <getopt.h> #include <getopt.h>
#include "progname.h"
static void static void
make_device_map (const char *device_map, int floppy_disks) make_device_map (const char *device_map, int floppy_disks)
{ {
@ -81,10 +84,10 @@ usage (int status)
{ {
if (status) if (status)
fprintf (stderr, fprintf (stderr,
"Try ``grub-mkdevicemap --help'' for more information.\n"); "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-mkdevicemap [OPTION]...\n\ Usage: %s [OPTION]...\n\
\n\ \n\
Generate a device map file automatically.\n\ Generate a device map file automatically.\n\
\n\ \n\
@ -96,7 +99,7 @@ Generate a device map file automatically.\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\
", ", program_name,
DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT); DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
exit (status); exit (status);
@ -108,7 +111,10 @@ main (int argc, char *argv[])
char *dev_map = 0; char *dev_map = 0;
int floppy_disks = 1; int floppy_disks = 1;
progname = "grub-mkdevicemap"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -140,7 +146,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

16
util/grub-mkfont.c
View file

@ -19,6 +19,7 @@
#include <config.h> #include <config.h>
#include <grub/types.h> #include <grub/types.h>
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/i18n.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -29,6 +30,8 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <freetype/ftsynth.h> #include <freetype/ftsynth.h>
#include "progname.h"
#define GRUB_FONT_DEFAULT_SIZE 16 #define GRUB_FONT_DEFAULT_SIZE 16
#define GRUB_FONT_RANGE_BLOCK 1024 #define GRUB_FONT_RANGE_BLOCK 1024
@ -90,10 +93,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-mkfont --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-mkfont [OPTIONS] FONT_FILES\n\ Usage: %s [OPTIONS] FONT_FILES\n\
\nOptions:\n\ \nOptions:\n\
-o, --output=FILE_NAME set output file name\n\ -o, --output=FILE_NAME set output file name\n\
-i, --index=N set face index\n\ -i, --index=N set face index\n\
@ -109,7 +112,7 @@ Usage: grub-mkfont [OPTIONS] FONT_FILES\n\
-V, --version print version information and exit\n\ -V, --version print version information and exit\n\
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n", PACKAGE_BUGREPORT); Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -472,7 +475,10 @@ main (int argc, char *argv[])
memset (&font_info, 0, sizeof (font_info)); memset (&font_info, 0, sizeof (font_info));
progname = "grub-mkfont"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -560,7 +566,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

16
util/grub-mkrelpath.c
View file

@ -18,8 +18,11 @@
*/ */
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/i18n.h>
#include <getopt.h> #include <getopt.h>
#include "progname.h"
static struct option options[] = static struct option options[] =
{ {
{"help", no_argument, 0, 'h'}, {"help", no_argument, 0, 'h'},
@ -30,10 +33,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-mkrelpath --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-mkrelpath [OPTIONS] PATH\n\ Usage: %s [OPTIONS] PATH\n\
\n\ \n\
Make a system path relative to it's root.\n\ Make a system path relative to it's root.\n\
\n\ \n\
@ -41,7 +44,7 @@ Options:\n\
-h, --help display this message and exit\n\ -h, --help display this message and exit\n\
-V, --version print version information and exit\n\ -V, --version print version information and exit\n\
\n\ \n\
Report bugs to <%s>.\n", PACKAGE_BUGREPORT); Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -51,7 +54,10 @@ main (int argc, char *argv[])
{ {
char *argument, *relpath; char *argument, *relpath;
progname = "grub-mkrelpath"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -68,7 +74,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
default: default:

12
util/grub-pe2elf.c
View file

@ -1,7 +1,7 @@
/* grub-pe2elf.c - tool to convert pe image to elf. */ /* grub-pe2elf.c - tool to convert pe image to elf. */
/* /*
* GRUB -- GRand Unified Bootloader * GRUB -- GRand Unified Bootloader
* Copyright (C) 2008 Free Software Foundation, Inc. * Copyright (C) 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
@ -40,10 +40,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-pe2elf --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-pe2elf [OPTIONS] input [output]\n\ Usage: %s [OPTIONS] input [output]\n\
\n\ \n\
Tool to convert pe image to elf.\n\ Tool to convert pe image to elf.\n\
\nOptions:\n\ \nOptions:\n\
@ -51,7 +51,7 @@ Tool to convert pe image to elf.\n\
-V, --version print version information and exit\n\ -V, --version print version information and exit\n\
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n", PACKAGE_BUGREPORT); Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -467,7 +467,7 @@ main (int argc, char *argv[])
char *image; char *image;
FILE* fp; FILE* fp;
progname = "grub-pe2elf"; set_program_name (argv[0]);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -484,7 +484,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

16
util/grub-probe.c
View file

@ -31,6 +31,7 @@
#include <grub/term.h> #include <grub/term.h>
#include <grub/env.h> #include <grub/env.h>
#include <grub/raid.h> #include <grub/raid.h>
#include <grub/i18n.h>
#include <grub_probe_init.h> #include <grub_probe_init.h>
@ -43,6 +44,8 @@
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include <getopt.h> #include <getopt.h>
#include "progname.h"
enum { enum {
PRINT_FS, PRINT_FS,
PRINT_FS_UUID, PRINT_FS_UUID,
@ -303,10 +306,10 @@ usage (int status)
{ {
if (status) if (status)
fprintf (stderr, fprintf (stderr,
"Try ``grub-probe --help'' for more information.\n"); "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-probe [OPTION]... [PATH|DEVICE]\n\ Usage: %s [OPTION]... [PATH|DEVICE]\n\
\n\ \n\
Probe device information for a given path (or device, if the -d option is given).\n\ Probe device information for a given path (or device, if the -d option is given).\n\
\n\ \n\
@ -319,7 +322,7 @@ Probe device information for a given path (or device, if the -d option is given)
-v, --verbose print verbose messages\n\ -v, --verbose print verbose messages\n\
\n\ \n\
Report bugs to <%s>.\n\ Report bugs to <%s>.\n\
", ", program_name,
DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT); DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
exit (status); exit (status);
@ -331,7 +334,10 @@ main (int argc, char *argv[])
char *dev_map = 0; char *dev_map = 0;
char *argument; char *argument;
progname = "grub-probe"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
/* Check for options. */ /* Check for options. */
while (1) while (1)
@ -376,7 +382,7 @@ main (int argc, char *argv[])
break; break;
case 'V': case 'V':
printf ("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
return 0; return 0;
case 'v': case 'v':

9
util/misc.c
View file

@ -39,6 +39,8 @@
#include <grub/term.h> #include <grub/term.h>
#include <grub/time.h> #include <grub/time.h>
#include "progname.h"
/* Include malloc.h, only if memalign is available. It is known that /* Include malloc.h, only if memalign is available. It is known that
memalign is declared in malloc.h in all systems, if present. */ memalign is declared in malloc.h in all systems, if present. */
#ifdef HAVE_MEMALIGN #ifdef HAVE_MEMALIGN
@ -50,7 +52,6 @@
#include <winioctl.h> #include <winioctl.h>
#endif #endif
char *progname = 0;
int verbosity = 0; int verbosity = 0;
void void
@ -58,7 +59,7 @@ grub_util_warn (const char *fmt, ...)
{ {
va_list ap; va_list ap;
fprintf (stderr, "%s: warn: ", progname); fprintf (stderr, "%s: warn: ", program_name);
va_start (ap, fmt); va_start (ap, fmt);
vfprintf (stderr, fmt, ap); vfprintf (stderr, fmt, ap);
va_end (ap); va_end (ap);
@ -73,7 +74,7 @@ grub_util_info (const char *fmt, ...)
{ {
va_list ap; va_list ap;
fprintf (stderr, "%s: info: ", progname); fprintf (stderr, "%s: info: ", program_name);
va_start (ap, fmt); va_start (ap, fmt);
vfprintf (stderr, fmt, ap); vfprintf (stderr, fmt, ap);
va_end (ap); va_end (ap);
@ -87,7 +88,7 @@ grub_util_error (const char *fmt, ...)
{ {
va_list ap; va_list ap;
fprintf (stderr, "%s: error: ", progname); fprintf (stderr, "%s: error: ", program_name);
va_start (ap, fmt); va_start (ap, fmt);
vfprintf (stderr, fmt, ap); vfprintf (stderr, fmt, ap);
va_end (ap); va_end (ap);

12
util/sparc64/ieee1275/grub-mkimage.c
View file

@ -188,10 +188,10 @@ static void
usage (int status) usage (int status)
{ {
if (status) if (status)
fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n"); fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
else else
printf ("\ printf ("\
Usage: grub-mkimage [OPTION]... [MODULES]\n\ Usage: %s [OPTION]... [MODULES]\n\
\n\ \n\
Make a bootable image of GRUB.\n\ Make a bootable image of GRUB.\n\
\n\ \n\
@ -204,7 +204,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); ", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
exit (status); exit (status);
} }
@ -218,7 +218,11 @@ main (int argc, char *argv[])
char *memdisk = NULL; char *memdisk = NULL;
FILE *fp = stdout; FILE *fp = stdout;
progname = "grub-mkimage"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
while (1) while (1)
{ {
int c = getopt_long (argc, argv, "d:p:m:o:hVv", options, 0); int c = getopt_long (argc, argv, "d:p:m:o:hVv", options, 0);

7
util/sparc64/ieee1275/grub-ofpathname.c
View file

@ -24,11 +24,14 @@ int main(int argc, char **argv)
{ {
char *of_path; char *of_path;
progname = "grub-ofpathname"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
if (argc != 2) if (argc != 2)
{ {
printf("Usage: grub-ofpathname DEVICE\n"); printf("Usage: %s DEVICE\n", program_name);
return 1; return 1;
} }

11
util/sparc64/ieee1275/grub-setup.c
View file

@ -401,10 +401,10 @@ 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: %s [OPTION]... DEVICE\n\
\n\ \n\
Set up images to boot from DEVICE.\n\ Set up images to boot from DEVICE.\n\
DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\ DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
@ -419,7 +419,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\
", ", program_name
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);
@ -616,7 +616,10 @@ main (int argc, char *argv[])
{ {
struct grub_setup_info ginfo; struct grub_setup_info ginfo;
progname = "grub-setup"; set_program_name (argv[0]);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
init_info (&ginfo); init_info (&ginfo);
if (!parse_options (&ginfo, argc, argv)) if (!parse_options (&ginfo, argc, argv))