* util/grub-mkconfig_lib.in: Fix typo.

* grub-core/script/argv.c (grub_script_argv_split_append): Skip leading
spaces.
* tests/grub_script_leading_whitespace.in: New file.
* Makefile.util.def (grub_script_leading_whitespace): New test.

* grub-core/kern/dl.c (grub_dl_add): Make global in order for gdb_grub
to work.

* grub-core/fs/jfs.c (grub_jfs_label): Use first label if second one
starts with control character.

* grub-core/gdb/cstub.c (grub_gdb_inbuf): Increase the size to avoid
overflow.
(grub_gdb_outbuf): Likewise.

* grub-core/commands/menuentry.c (grub_normal_add_menu_entry): Add
zero terminator. Fixes a crash.

* grub-core/loader/i386/linux.c (allocate_pages): Don't allocate
beyond 4 GiB.
(grub_cmd_linux): Use GRUB_LINUX_BZIMAGE_ADDR for non-relocatable
images independently of preffered adderss field.

* grub-core/commands/i386/pc/play.c: Improve TRANSLATORS comments.
* grub-core/commands/regexp.c: Likewise.
* grub-core/loader/i386/linux.c: Likewise.
* grub-core/partmap/msdos.c: Likewise.
* grub-core/script/execute.c: Likewise.
* grub-core/term/gfxterm.c: Likewise.

Add variable parsing in $"..." and fix several mismatches with bash.

* Makefile.util.def (grub_script_gettext): New test.
* grub-core/script/execute.c (parse_string): New function.
(gettext_append): Likewise.
(grub_script_arglist_to_argv): Use gettext_append.
* grub-core/script/yylex.l: Fix slash and newline handling in $"...".
* tests/grub_script_gettext.in: New file.

Fix handling of leading spaces in scripts.

* grub-core/normal/cmdline.c (grub_cmdline_get): Don't strip leading
spaces.
* grub-core/normal/main.c (grub_file_getline): Remove all preprocessing
other than skipping \r. All users updated.
* tests/grub_script_echo1.in: Add space-related tests.
* util/grub-menulst2cfg.c (main): Remove useless space skipping.

* grub-core/commands/cat.c (grub_cmd_cat): Fix termination key check.

* configure.ac: Bump up the version to beta2.

Fix gettext reload bugs (e.g. inability to disable gettext
once enabled).

* grub-core/gettext/gettext.c: Encapsulate all static variables in
main_context and secondary_context. All functions updated.
(grub_gettext_translate): Rename to ...
(grub_gettext_translate_real): ... this. Return NULL on failed
translate.
(grub_gettext_translate): Handle secondary context.
(grub_gettext_delete_list): Close file and zero-out the context.
(grub_mofile_open): Don't call grub_gettext_delete_list.
Don't close file.
(grub_gettext_init_ext): Call grub_gettext_init_ext. Skip loading
if locale="" to avoid pointless error message.
(grub_gettext_env_write_lang): Update lang even if load fails.
Handle secondary context.
(grub_gettext_reread_prefix): New function.
(read_main): Likewise.
(read_secondary): Likewise.
(GRUB_MOD_INIT): Handle secondary context. Hook and export variables.
(GRUB_MOD_FINI): Handle secondary context. Don't close file.
* grub-core/normal/main.c (read_lists): Call grub_gettext_reread_prefix.
* include/grub/normal.h (grub_gettext_reread_prefix): New proto.

* configure.ac: Decrease warning level to avoid spurious warnings and
to be able to compile with GCC 4.2.
* Makefile.util.def: Remove -Wno-error=logical-op.

* util/import_unicode.py: Add missing brackets around string for
python 3 support.

Fix efi chainloader on network root.

* grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Handle
network devices.
* grub-core/net/drivers/efi/efinet.c (grub_efinet_get_device_handle):
New function.

* grub-core/gfxmenu/gui_progress_bar.c (grub_gui_progress_bar): Remove
unused show_text member.
* docs/grub.texi: Document "text" property.

* grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Fix format
in dprintf.

Fix IMSM handling on Fedora.

* util/getroot.c (grub_util_is_imsm): New function.
(grub_util_get_dev_abstraction): Treat IMSM as simple device, not RAID.

* Makefile.am: Strip gold section.
* conf/Makefile.common: Likewise.
* gentpl.py: Likewise.
* grub-core/Makefile.core.def: Likewise.
* grub-core/genmod.sh.in: Likewise.

* util/grub.d/10_linux.in: Use stat if grub-probe on root fails.
* util/grub.d/20_linux_xen.in: Likewise.
Based on Debian patch.

* util/grub.d/10_linux.in: Fix syntax error resulting in
Richard Laager's patch.
* util/grub.d/20_linux_xen.in: Propagate Richard Laager's patch.

* tests/partmap_test.in: Replace qemu-img usage with dd to decrease
dependencies.

* util/grub.d/10_linux.in: Fix ZFS root passing.

* grub-core/commands/videoinfo.c: Add TRANSLATORS comments.
* grub-core/commands/xnu_uuid.c: Likewise.
* grub-core/loader/efi/appleloader.c: Likewise.
* grub-core/script/execute.c: Likewise.
* grub-core/script/main.c: Likewise.
* util/grub-mkfont.c: Likewise.

* util/grub-mkfont.c (options): Use more appropriate "select" that
"set" for face index.

* util/grub-editenv.c (options): Gettextize command summaries.

* grub-core/loader/efi/chainloader.c (grub_cmd_chainloader): Use
"out of memory" error messagge.

* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Add scanning
of diskfilter for diskfilter on diskfilter support.

* util/getroot.c (exec_pipe): Ensure that the child is not localised.

* util/grub-install.in: Check for themes/starfield/theme.txt and not
themes/starfield.

* grub-core/gnulib/regcomp.c (regerror): Fix out-of-range array lookup.

* grub-core/gdb/i386/idt.c (grub_gdb_breakpoint): Remove old debug code.

* grub-core/commands/hashsum.c (grub_cmd_hashsum): Remove dot at the end
of error message.

* util/grub-install.in: Fix install non-PreP IEEE1275 install.

* grub-core/commands/i386/pc/sendkey.c (GRUB_MOD_INIT): Fix confusing
message.
* util/grub-install.in: Fix anf gettextize error message.

* util/grub-fstest.c (options): Replace N with NUM and S with STRING.
Gettextize.
* util/grub-mount.c (options): Likewise.

* grub-core/commands/probe.c (options): Replace VAR with VARNAME and
gettextize.
* grub-core/commands/search_wrap.c (options): Likewise.

* grub-core/normal/charset.c (bidi_line_wrap): Fix a spurious warning.

* grub-core/boot/i386/pc/startup_raw.S (multiboot_trampoline): Fix
size calculation.
* grub-core/kern/i386/realmode.S (realidt): Assume default BIOS IDT if
none is known.

* grub-core/net/net.c (grub_net_addr_to_str): Don't translate
"temporary" since it's used in identifier and is limited in space.

* po/POTFILES.in: Regenerate. Include *.h since they contain
translatable strings as well.

* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Add missing
byte-swap on big-endian.
Reported by: Lennart Sorensen

* grub-core/loader/i386/linux.c (prot_init_space): New variable.
(allocate_pages): Improve dprintf.
(grub_cmd_linux): Fill prot_init_space. Fix improper usage of
code32_start. Fill code32_start and kernel_alignment in params.
(grub_cmd_initrd): Use prot_init_space.

* util/grub-mkstandalone.in: Propagate grub-mkimage.c change.

* util/grub-install.in: Add missing dot at the end of sentence.

* grub-core/commands/videoinfo.c: Add TRANSLATORS comments.
* grub-core/commands/videotest.c: Likewise.
* grub-core/loader/i386/linux.c: Likewise.

* grub-core/commands/acpi.c (options): Fix a dot in the middle of the
sentence.
Reported by: Milo Casagrande.

* grub-core/commands/acpi.c: Add TRANSLATORS comments.
* grub-core/commands/gptsync.c: Likewise.
* grub-core/commands/hashsum.c: Likewise.
* grub-core/commands/i386/pc/sendkey.c: Likewise.
* grub-core/commands/legacycfg.c: Likewise.
* grub-core/io/gzio.c: Likewise.
* grub-core/net/net.c: Likewise.
* grub-core/term/gfxterm.c: Likewise.
* grub-core/term/terminfo.c: Likewise.
* grub-core/tests/test_blockarg.c: Likewise.
* grub-core/video/video.c: Likewise.
* util/grub-install.in: Likewise.
* util/grub-mkfont.c: Likewise.

* util/grub-mkimage.c (help_filter): Add missing capitalisation.

* grub-core/commands/search_wrap.c (options): Fix a typo.

* util/grub-kbdcomp.in: Change "layout" to "keyboard layout" in
description.

* util/grub-script-check.c (main): Fix a syntax error message which was
unclear.

* util/grub-mkrescue.in (usage): Fix ROM capitalisation.

* grub-core/commands/search_wrap.c (options): Fix wrong copy-paste in
messages.

* util/grub-fstest.c (options): Remove OPTION_ARG_OPTIONAL from options
without argument.
* util/grub-mount.c (options): Likewise.

* util/grub-mkimage.c (generate_image): Unify diskboot.img size message.

* grub-core/net/http.c: Add TRANSLATORS comments.
* grub-core/normal/cmdline.c: Likewise.
* grub-core/normal/misc.c: Likewise.
* grub-core/partmap/msdos.c: Likewise.
* grub-core/parttool/msdospart.c: Likewise.
* grub-core/script/execute.c: Likewise.
* grub-core/script/main.c: Likewise.
* grub-core/term/terminfo.c: Likewise.
* grub-core/video/bitmap.c: Likewise.
* util/grub-install.in: Likewise.
* util/grub-mkimage.c: Likewise.
* util/grub-mklayout.c: Likewise.
* util/grub-setup.c: Likewise.

* util/grub-mount.c (fuse_init): Unify cryptomount and loopback messages
with similar messages in grub-fstest.

* util/grub-install.in: Unify "option requires an argument" message
with similar messages in other files.
* util/grub-mkconfig.in: Likewise.

* util/grub-set-default.in: Replace printf with gettext_printf (the
string in in question is already translated from grub-reboot)

* configure.ac: Bump up the version to beta1.

* grub-core/loader/i386/linux.c (allocate_pages): Fix handling of the
case when min_align = 0.

* grub-core/normal/charset.c (bidi_line_wrap): Fix a spurious warning
and fix a case when line_start overflows.

* util/grub-reboot.in (usage): Mention id posibility.
* util/grub-set-default.in (usage): Likewise.

* include/grub/misc.h (ALIGN_UP_OVERHEAD): New define.
* grub-core/loader/i386/linux.c (grub_cmd_initrd): Align initrds at 4.
* grub-core/loader/i386/pc/linux.c (grub_cmd_initrd): Likewise.
* grub-core/loader/ia64/efi/linux.c (grub_cmd_initrd): Likewise.
* grub-core/loader/mips/linux.c (grub_cmd_initrd): Likewise.
* grub-core/loader/powerpc/ieee1275/linux.c (grub_cmd_initrd): Likewise.
* grub-core/loader/sparc64/ieee1275/linux.c (grub_cmd_initrd): Likewise.

* grub-core/commands/menuentry.c (options): Remove
GRUB_ARG_OPTION_REPEATABLE.
Reported by: Andreas Vogel

* grub-core/normal/main.c (grub_normal_free_menu): Fix memory leak.

* grub-core/normal/menu_entry.c (kill_line): Fix a crash and off-by-one
error.

Use sort -V by the idea of Georgi Georgiev.

* util/grub-mkconfig_lib.in (version_sort): New function.
(version_test_numeric): Use version_sort.

Use submenus in grub-mkconfig.

* util/grub-mkconfig.in: Define GRUB_ACTUAL_DEFAULT.
* util/grub-mkconfig_lib.in (grub_quote): New function.
(gettext_printf): Use gettext and not gettext_quoted to fix several
messages.
* util/grub.d/10_hurd.in: Use submenus.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/grub.d/10_illumos.in: Add missing quoting.
* util/grub.d/10_windows.in: Likewise.

Fix menu title instability bug.

* grub-core/commands/menuentry.c (options): New option --id.
(grub_normal_add_menu_entry): New argument id. All users updated.
(grub_cmd_menuentry): Handle --id.
(grub_menu_init): Accept unknown arguments.
* grub-core/normal/main.c (features): Add feature_menuentry_id and
feature_menuentry_options.
* grub-core/normal/menu.c (grub_menu_execute_entry): Use id for
saved_entry.
(get_entry_number): Match with id as well.
* include/grub/menu.h (grub_menu_entry): New member id.
* util/grub-mkconfig_lib.in (grub_get_device_id): New function.
* util/grub.d/00_header.in: Define menuentry_id_option.
* util/grub.d/10_hurd.in: Define id.
* util/grub.d/10_illumos.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.

* grub-core/script/execute.c (grub_script_return): Replace ambiguous
"scope" with "body".

* include/grub/i386/linux.h (linux_kernel_header): Fix init_size type.
* grub-core/loader/i386/linux.c (grub_cmd_linux): Differentiate between
prot_size and prot_file_size.

* grub-core/disk/diskfilter.c (is_lv_readable): New argument "easily".
All users updated. If easily=1 require raid-5/-6 to be full.
(is_node_readable): Likewise.
(scan_devices): Scan incomplete but readable LVs at the end.
(grub_diskfilter_memberlist): Pull missing devices.
(insert_array): Skip scanning until device is complete or scan is
done otherwise.
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Fix wrong
check.
* include/grub/diskfilter.h (grub_diskfilter_lv): New member scanned.
* util/raid.c (grub_util_raid_getmembers): Handle "removed" disks.

Avoid EFI boot services when loading Linux.

* grub-core/lib/i386/relocator.c (grub_relocator32_boot): New argument
avoid_efi_bootservices. All users updated.
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): New
argument avoid_efi_bootservices. All users updated.
Use grub_efi_mmap_iterate on EFI, grub_mmap_iterate if available.
* grub-core/loader/i386/linux.c (allocate_pages): New arguments
align, min_align, relocatable, prefered_address. All users updated.
Allocate avoiding boot services if kernel is relocatable.
(grub_cmd_linux): Check if kernel is relocatable.
* grub-core/mmap/efi/mmap.c (grub_machine_mmap_iterate): Move most to ..
(grub_efi_mmap_iterate): ... here. New argument avoid_efi_boot_services.
Skip GRUB_EFI_BOOT_SERVICES_DATA and GRUB_EFI_BOOT_SERVICES_CODE if
avoid_efi_boot_services.
(grub_machine_mmap_iterate): Wrap grub_efi_mmap_iterate.
* include/grub/i386/linux.h (linux_kernel_header): Update to 2.10.
(linux_kernel_params): Likewise.

Also-By: Vladimir Serbinenko <phcoder@gmail.com>

Use EDID on EFI.

* grub-core/kern/efi/efi.c (grub_efi_get_variable): New argument
datasize_out.
* grub-core/video/efi_gop.c (check_protocol): Check that GOP has usable
modes. Set gop_handle.
(grub_video_gop_get_edid): New function.
(grub_gop_get_preferred_mode): Likewise.
(grub_video_gop_setup): Use grub_gop_get_preferred_mode.
(grub_video_efi_gop_adapter): Set .get_edid.
* include/grub/efi/edid.h: New file.
* include/grub/efi/efi.h (grub_efi_get_variable): Update proto.

Also-By: Vladimir Serbinenko <phcoder@gmail.com>

* util/grub-install.in: Load efivars unconditionally.

merge mainline into reloc

* po/Rules-piglatin: Change suffix from .po-update-en to
.po-update-en-piglatin.

Fix FTBFS on mips and ppc

Fix compile error

boot services avoid code based on the patch by Matthew Garrett

Add a pig farm.

* grub-core/commands/date.c (GRUB_MOD_INIT): Remove non-uniform
"Command for ...".
* grub-core/commands/hdparm.c (options): Use "Display" rather than
"Check" since we don't check anything.
* grub-core/commands/i386/cpuid.c (options): Clarify that long mode
is 64-bit one.
* grub-core/commands/search_wrap.c (options): Clarify the conditions.
* grub-core/disk/geli.c (grub_md_sha256_real): Fix typo.
(grub_md_sha512_real): Likewise.

* grub-core/commands/gptsync.c: Fix typographic quoting.
* grub-core/commands/ieee1275/suspend.c: Likewise.
* grub-core/commands/parttool.c: Likewise.
* grub-core/commands/search_wrap.c: Likewise.
* grub-core/commands/videoinfo.c: Likewise.
* grub-core/gfxmenu/gui_label.c: Likewise.
* grub-core/hello/hello.c: Likewise.
* grub-core/kern/emu/main.c: Likewise.
* grub-core/net/net.c: Likewise.
* grub-core/normal/menu.c: Likewise.
* grub-core/normal/menu_text.c: Likewise.
* grub-core/normal/misc.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-install.in: Likewise.
* util/grub-kbdcomp.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub-reboot.in: Likewise.
* util/grub-set-default.in: Likewise.
* util/grub-setup.c: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.

* grub-core/commands/acpihalt.c: Add TRANSLATORS comments.
* grub-core/commands/keystatus.c: Likewise.
* grub-core/commands/loadenv.c: Likewise.
* grub-core/commands/probe.c: Likewise.
* grub-core/commands/regexp.c: Likewise.
* grub-core/commands/true.c: Likewise.
* grub-core/commands/videoinfo.c: Likewise.
* grub-core/disk/cryptodisk.c: Likewise.
* grub-core/disk/ldm.c: Likewise.
* grub-core/disk/loopback.c: Likewise.
* grub-core/disk/luks.c: Likewise.
* grub-core/fs/zfs/zfsinfo.c: Likewise.
* grub-core/kern/disk.c: Likewise.
* grub-core/kern/emu/hostdisk.c: Likewise.

* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Add TRANSLATORS comment.
* util/grub-install.in: Add missing quote in the comment.

* grub-core/commands/i386/pc/drivemap.c: Add TRANSLATORS comments.
* grub-core/commands/lsmmap.c: Likewise.
* grub-core/commands/minicmd.c: Likewise.
* grub-core/commands/mips/loongson/lsspd.c: Likewise.
* grub-core/commands/regexp.c: Likewise.
* grub-core/gdb/gdb.c: Likewise.
* grub-core/term/gfxterm.c: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mklayout.c: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.

* grub-core/commands/videoinfo.c (hook): Replace "Direct"
with "Direct color" and "Packed" with "Packed pixel".
(grub_cmd_videoinfo): Simplify legend.

* util/getroot.c (grub_make_system_path_relative_to_its_root): Fix
absolutely unclear error message.

* util/grub-mkstandalone.in: Remove confusing leftover print.

* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Add TRANSLATORS
comments.
* grub-core/gdb/gdb.c (grub_cmd_gdbstub): Likewise.
(GRUB_MOD_INIT): Likewise.
* grub-core/loader/i386/linux.c (grub_cmd_linux): Clarify that it's
VGA mode.
* grub-core/net/net.c (grub_net_route_address): Add TRANSLATORS
comments.
* util/grub-install.in (usage): Likewise.
Spell ID in whole letters.
Add missing ending dot.
Quote variables.
* util/grub-reboot.in: Fix capitalisation.
* util/grub-set-default.in: Likewise.

* util/getroot.c (strip_extra_slashes) [CYGWIN]: #ifdef-out.
(exec_pipe) [CYGWIN || MINGW32]: Likewise.
(find_root_devices_from_poolname) [CYGWIN || MINGW32]: Likewise.
(find_root_devices_from_libzfs) [CYGWIN || MINGW32]: Likewise.
Disable -Werror for -Wdeprecated-declarations.
(grub_guess_root_devices) [CYGWIN || MINGW32]: #ifdef-out.
(get_dm_uuid) [!HAVE_DEVICE_MAPPER]: Likewise.
(grub_util_get_dm_abstraction) [! __linux__]: #ifdef-out.
(grub_util_get_grub_dev): Make luks handling dependent on
HAVE_DEVICE_MAPPER and not __linux__.
(get_win32_path): Fix format security.
(grub_find_zpool_from_dir) [CYGWIN || MINGW32]: #ifdef-out.
(grub_make_system_path_relative_to_its_root) [CYGWIN || MINGW32]:
Don't try grub_find_zpool_from_dir.
(grub_make_system_path_relative_to_its_root) [!__linux__]:
#ifdef-out paresdir.

* util/grub-pe2elf.c (usage): Add missing noreturn.
(write_section_data): Rename name to shname to avoid shadowing.
(write_symbol_table): Rename name to symname to avoid shadowing.
Fix write_reloc_section call.

* grub-core/boot/i386/pc/startup_raw.S: Move decompressor_end to .bss
to ensure that it's after the last byte of .text.

* util/ieee1275/ofpath.c (my_isdigit): New function.
(trailing_digits): Use my_isdigit.
(strip_trailing_digits): Likewise.

* util/resolve.c (read_dep_list): Use grub_isspace instead of isspace.
* grub-core/kern/emu/hostdisk.c (read_device_map): Likewise.

* grub-core/kern/i386/pc/startup.S: Define __start.