Re: merging of gettext branch

[Carles Pina i Estany]

Hi,

On Nov/21/2009, Carles Pina i Estany wrote:

> My gettext branch:
> bzr.savannah.gnu.org/srv/bzr/grub/people/cpina/gettext/

If the branch wants to be merged I suggest to use this ChangeLog:
--------
YYYY-MM-DD  Carles Pina i Estany <address@hidden>

        * conf/common.rmk: Add grub-gettext_lib target, dependency and
          SOURCES, CFLAGS, LDFLAGS
        * gettext/gettext.c: New file with gettext implementation
        * include/grub/i18n_grub.h: New file with grub_gettext macros
        * include/grub/misc.h: Define macro _(char *s). Declare
          grub_gettext_dummy and grub_gettext
        * kern/misc.c: Define grub_gettext symbol implementation of the
          grub_gettext_dummy function
        * normal/menu_text.c: Gettextize one message in print_message
        * po/POTFILES: Adds normal/menu_text.c
        * po/ca.po: Adds the new string
        * util/grub.d/00_header.in: defines gettext variables and loads
          the module
--------

Since the commits of the branch doesn't follow the rules correctly

-- 
Carles Pina i Estany
        http://pinux.info