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

* INSTALL: Document Automake is needed for bootstrap.
        * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
        * util/grub.d/10_kfreebsd.in (bindir): New variable.
        Add gettext initialization.
        (kfreebsd_entry): Make menuentry output translatable.
This commit is contained in:
Robert Millan 2009-11-17 11:44:43 +00:00
parent 5dd39a2f3b
commit 37fb845ba6
5 changed files with 24 additions and 8 deletions

View file

@ -1,3 +1,11 @@
2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* INSTALL: Document Automake is needed for bootstrap.
* po/ca.po: Fix PO-Revision-Date and Language-Team fields.
* util/grub.d/10_kfreebsd.in (bindir): New variable.
Add gettext initialization.
(kfreebsd_entry): Make menuentry output translatable.
2009-11-17 Robert Millan <rmh.grub@aybabtu.com> 2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables. * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables.

View file

@ -22,6 +22,7 @@ need the following.
* Ruby 1.6 or later * Ruby 1.6 or later
* Autoconf 2.59d or later * Autoconf 2.59d or later
* Automake 1.10.1 or later
Configuring the GRUB Configuring the GRUB
==================== ====================

View file

@ -47,14 +47,13 @@ MSGFMT = @MSGFMT@
LINGUAS = $(shell tr '\n' ' ' < $(srcdir)/po/LINGUAS) LINGUAS = $(shell tr '\n' ' ' < $(srcdir)/po/LINGUAS)
PACKAGE = @PACKAGE@
PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE = @PACKAGE@
host_os = @host_os@ host_os = @host_os@
host_kernel = @host_kernel@ host_kernel = @host_kernel@
host_cpu = @host_cpu@ host_cpu = @host_cpu@

View file

@ -7,9 +7,9 @@ msgstr ""
"Project-Id-Version: GNU GRUB\n" "Project-Id-Version: GNU GRUB\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-16 00:05+0100\n" "POT-Creation-Date: 2009-11-16 00:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\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: LANGUAGE <LL@li.org>\n" "Language-Team: None <no-team-yet@li.org>\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"

View file

@ -18,9 +18,14 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
. ${libdir}/grub/grub-mkconfig_lib . ${libdir}/grub/grub-mkconfig_lib
. ${bindir}/gettext.sh
export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@LOCALEDIR@
case "${GRUB_DISTRIBUTOR}" in case "${GRUB_DISTRIBUTOR}" in
Debian) OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;; Debian) OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;;
*) OS="FreeBSD" ;; *) OS="FreeBSD" ;;
@ -28,9 +33,12 @@ esac
kfreebsd_entry () kfreebsd_entry ()
{ {
cat << EOF os="$1"
menuentry "$1" { version="$2"
EOF recovery="$3" # not used yet
args="$4" # not used yet
title="$(gettext "%s, with kFreeBSD %s")"
printf "menuentry \"${title}\" {" ${os} ${version}
if [ -z "${prepare_boot_cache}" ]; then if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
fi fi
@ -100,7 +108,7 @@ while [ "x$list" != "x" ] ; do
acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname` acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname`
fi fi
kfreebsd_entry "${OS}, kFreeBSD ${version}" kfreebsd_entry "${OS}" "${version}"
list=`echo $list | tr ' ' '\n' | grep -vx $kfreebsd | tr '\n' ' '` list=`echo $list | tr ' ' '\n' | grep -vx $kfreebsd | tr '\n' ' '`
done done