From: Carles Pina i Estany <carles@pina.cat>
Date: Mon, 23 Nov 2009 20:34:42 +0000 (+0000)
Subject: Merging with trunk
X-Git-Tag: 1.98~378^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b58fc33c4f1fb8c5459a2e8057a94094e24a6347;p=thirdparty%2Fgrub.git

Merging with trunk
---

b58fc33c4f1fb8c5459a2e8057a94094e24a6347
diff --cc include/grub/i18n.h
index 96317fd33,99efb819a..e4e06e9cd
--- a/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 */