Merging with trunk

author Carles Pina i Estany <carles@pina.cat>

Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)

committer Carles Pina i Estany <carles@pina.cat>

Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)
author Carles Pina i Estany <carles@pina.cat>
Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)
committer Carles Pina i Estany <carles@pina.cat>
Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)
diff --cc conf/common.rmk
Simple merge
diff --cc include/grub/i18n.h

index 96317fd33f7368fdc66ae791a287225bf0f6e894,99efb819a43b38c0eeaedd648f0d0968e777cb2d..e4e06e9cd0f805b3a1a84148cb9f4dff859d71cd
--- 1/include/grub/i18n.h
--- 2/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@@ -24,7 -24,9 +24,9 @@@
   # include <libintl.h>
   # define _(str) gettext(str)
   #else
- -# define _(str) str
+ +# define _(str) grub_gettext(str)
   #endif
   
+ #define N_(str) str
+ 
   #endif /* GRUB_I18N_H */
diff --cc normal/main.c
Simple merge
diff --cc po/ca.po
Simple merge
author	Carles Pina i Estany <carles@pina.cat>
	Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)
committer	Carles Pina i Estany <carles@pina.cat>
	Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)
		1	2
conf/common.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
include/grub/i18n.h	patch \|	diff1 \|	diff2 \|	blob \| history
normal/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
po/ca.po	patch \|	diff1 \|	diff2 \|	blob \| history