merging to trunk...

diff --git a/ChangeLog b/ChangeLog
index 4a26413d42ecbb7dd92b18ff8de50a4d3d761e6e..d9f2cee2aea5d8bc2424688c098b23ebef3ea81d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-22  Carles Pina i Estany <carles@pina.cat>
+
+       * conf/common.rmk: Add grub-gettext_lib target and updates
+         lib_DATA and CLEANFILES. Adds gettext.mod SOURCES, CFLAGS,
+         LDFLAGS.
+       * gettext/gettext.c: New file. (Reads mo files).
+       * include/grub/file.h (grub_file_pread): New prototype.
+       * include/grub/i18n.h (_): New prototype.
+       * include/grub/misc.h (grub_gettext_dummy, grub_gettext): New 
+         prototypes.
+       * kern/misc.c (grub_gettext_dummy): New function.
+       * menu/menu_text.c: Include <grub/i18n.h>.
+       * menu/menu_text.c (print_timeout): Gettexttize string.
+       * menu/menu_text.c (print_message): Gettexttize string.
+       * po/POTFILES: Add `normal/menu_text.c'.
+       * po/ca.po: Add new translations.
+       * util/grub.d/00_header.in: Define locale_dir and lang. insmod 
+         gettext module and defines locale_dir and lang in grub.cfg.
+
 2009-11-22  Robert Millan  <rmh.grub@aybabtu.com>
 
        * util/i386/pc/grub-mkimage.c: Ungettextize grub_util_info() strings.

diff --git a/ChangeLog.gettext b/ChangeLog.gettext
deleted file mode 100644 (file)
index a628698..0000000
--- a/ChangeLog.gettext
+++ /dev/null
@@ -1,18 +0,0 @@
-YYYY-MM-DD  Carles Pina i Estany <carles@pina.cat>
-
-       * conf/common.rmk: Add grub-gettext_lib target and updates
-         lib_DATA and CLEANFILES. Adds gettext.mod SOURCES, CFLAGS,
-         LDFLAGS.
-       * gettext/gettext.c: New file. (Reads mo files).
-       * include/grub/file.h (grub_file_pread): New prototype.
-       * include/grub/i18n.h (_): New prototype.
-       * include/grub/misc.h (grub_gettext_dummy, grub_gettext): New 
-         prototypes.
-       * kern/misc.c (grub_gettext_dummy): New function.
-       * menu/menu_text.c: Include <grub/i18n.h>.
-       * menu/menu_text.c (print_timeout): Gettexttize string.
-       * menu/menu_text.c (print_message): Gettexttize string.
-       * po/POTFILES: Add `normal/menu_text.c'.
-       * po/ca.po: Add new translations.
-       * util/grub.d/00_header.in: Define locale_dir and lang. insmod 
-         gettext module and defines locale_dir and lang in grub.cfg.