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.

diff --git a/ChangeLog.gettext b/ChangeLog.gettext
index a1451f1d1bcbf2b6707166902b647f4104e4ec22..93b241b9eedeb121e97352f6a9e9993612ed05f2 100644 (file)
--- a/ChangeLog.gettext
+++ b/ChangeLog.gettext
@@ -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>
 
        * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables.

diff --git a/INSTALL b/INSTALL
index f9ae8f9d2fd3a0a30487bad678c2dd826f6e5814..74bf3d490a321c643f170ebc40501ce98becb171 100644 (file)
--- 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 a87ace29dec4997de607f54a419deca760ffabcc..febba1f3370a28a45b4ad8a20ac517b09dedde82 100644 (file)
--- 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 4213346d42d25d1adc73402dc751412581063a00..69a44cdeb96be27b346d61ccdbea0bb31d13c251 100644 (file)
--- 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 <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"
 "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 cd8c186becf3e3d0471744b38bc7b3cde6f626ad..c6712e32fe1cbf8ca23c5f5892715f87fa659710 100644 (file)
--- 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