From 37fb845ba6c5f55db5f8c4412305dbc99c661487 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Tue, 17 Nov 2009 11:44:43 +0000 Subject: [PATCH] 2009-11-17 Robert Millan * 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. --- ChangeLog.gettext | 8 ++++++++ INSTALL | 1 + Makefile.in | 3 +-- po/ca.po | 4 ++-- util/grub.d/10_kfreebsd.in | 16 ++++++++++++---- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog.gettext b/ChangeLog.gettext index a1451f1d1..93b241b9e 100644 --- a/ChangeLog.gettext +++ b/ChangeLog.gettext @@ -1,3 +1,11 @@ +2009-11-17 Robert Millan + + * 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 * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables. diff --git a/INSTALL b/INSTALL index f9ae8f9d2..74bf3d490 100644 --- a/INSTALL +++ b/INSTALL @@ -22,6 +22,7 @@ need the following. * Ruby 1.6 or later * Autoconf 2.59d or later +* Automake 1.10.1 or later Configuring the GRUB ==================== diff --git a/Makefile.in b/Makefile.in index a87ace29d..febba1f33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,14 +47,13 @@ MSGFMT = @MSGFMT@ LINGUAS = $(shell tr '\n' ' ' < $(srcdir)/po/LINGUAS) +PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE = @PACKAGE@ - host_os = @host_os@ host_kernel = @host_kernel@ host_cpu = @host_cpu@ diff --git a/po/ca.po b/po/ca.po index 4213346d4..69a44cdeb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: GNU GRUB\n" "Report-Msgid-Bugs-To: \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 \n" -"Language-Team: LANGUAGE \n" +"Language-Team: None \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in index cd8c186be..c6712e32f 100644 --- a/util/grub.d/10_kfreebsd.in +++ b/util/grub.d/10_kfreebsd.in @@ -18,9 +18,14 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ +bindir=@bindir@ libdir=@libdir@ . ${libdir}/grub/grub-mkconfig_lib +. ${bindir}/gettext.sh +export TEXTDOMAIN=@PACKAGE@ +export TEXTDOMAINDIR=@LOCALEDIR@ + case "${GRUB_DISTRIBUTOR}" in Debian) OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;; *) OS="FreeBSD" ;; @@ -28,9 +33,12 @@ esac kfreebsd_entry () { - cat << EOF -menuentry "$1" { -EOF + os="$1" + version="$2" + 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 prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" fi @@ -100,7 +108,7 @@ while [ "x$list" != "x" ] ; do acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname` fi - kfreebsd_entry "${OS}, kFreeBSD ${version}" + kfreebsd_entry "${OS}" "${version}" list=`echo $list | tr ' ' '\n' | grep -vx $kfreebsd | tr '\n' ' '` done