2009-11-19 Carles Pina i Estany <carles@pina.cat>

	* include/grb/i18n_grub.h: same than i18n.h but for Grub Kernel.
	* include/grub/misc.h: includes i18n_grub.h.
	* normal/menu_text.c: gettize more strings.
	* po/POTFILES: Update with new file.
	* po/ca.po: New strings.

diff --git a/include/grub/i18n_grub.h b/include/grub/i18n_grub.h
new file mode 100644 (file)
index 0000000..ed33825
--- /dev/null
+++ b/include/grub/i18n_grub.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef        GRUB_I18N_GRUB_H
+#define        GRUB_I18N_GRUB_H        1
+
+# define _(str) grub_gettext(str)
+
+#endif /* GRUB_I18N_GRUB_H */

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 0a3406737904cdf74398f0c52834e0c08a11c2ec..bc725f9cadaabc1d4f669043810906c538394355 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -34,8 +34,6 @@
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)     grub_memmove ((d), (s), (n))
 
-#define _(s)   grub_gettext(s)
-
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
 char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);

diff --git a/normal/menu_text.c b/normal/menu_text.c
index e757110c0699a0b663993fba3872c6b308471c62..66a0bcfb4cbcdb5463911237a189ad7f8d3bb99f 100644 (file)
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -25,6 +25,7 @@
 #include <grub/time.h>
 #include <grub/env.h>
 #include <grub/menu_viewer.h>
+#include <grub/i18n_grub.h>
 
 /* Time to delay after displaying an error message about a default/fallback
    entry failing to boot.  */

diff --git a/po/POTFILES b/po/POTFILES
index 5b1239a5e9d9fdae9ab9605695574cee03bb8f36..c0fc40c306c0a4255d74f6b351dd3617a804ffa3 100644 (file)
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -10,3 +10,5 @@ util/mkisofs/multi.c
 util/mkisofs/rock.c
 util/mkisofs/tree.c
 util/mkisofs/write.c
+
+normal/menu_text.c

diff --git a/po/ca.po b/po/ca.po
index 3f9b0ac3210407b826d2b2c1719de450c4f814b0..02cfe375195d3900d1505d84f8b337f5cba5b28d 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU GRUB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-19 00:16+0100\n"
+"POT-Creation-Date: 2009-11-19 21:37+0000\n"
 "PO-Revision-Date: 2009-11-17 12:26+0100\n"
 "Last-Translator: Robert Millan <rmh.grub@aybabtu.com>\n"
 "Language-Team: None <no-team-yet@li.org>\n"
@@ -882,6 +882,15 @@ msgstr ""
 msgid "Path table size(bytes): %d\n"
 msgstr ""
 
+#: normal/menu_text.c:97
+#, c-format
+msgid ""
+"\n"
+"      Use the %C and %C keys to select which entry is highlighted.\n"
+msgstr ""
+"\n"
+"      Utilitzeu les tecles %C i %C per a seleccionar l'entrada.\n"
+
 #: util/grub.d/10_kfreebsd.in:40
 msgid "%s, with kFreeBSD %s"
 msgstr ""