Hi,
On Dec/07/2009, Carles Pina i Estany wrote:
> > IME, if it's not difficult to get rid of it, it better to do it for
> > safety, because it's a common translator mistake.
>
> I will remove the spaces. Only in one place is not straight but it's
> not difficult.
Done in the attached patch.
Can someone take a look in the patch again?
It's the same than previously in this thread but with some change (added
grub_ in a exported function) and in grub_normal_print_device_info I've
changed some messages like:
- grub_printf (", Label %s", label);
+ grub_printf_ (N_("- Label %s"), label);
- grub_printf (", Last modification time %d-%02d-%02d "
- "%02d:%02d:%02d %s",
+ grub_printf_ (N_("- Last modification time
%d-%02d-%02d "
+ "%02d:%02d:%02d %s"),
using "-" instead of "," makes it easier for the translators because it
doesn't pretend to be a sentence but only different items in an
enumeration.
Thanks,
--
Carles Pina i Estany
http://pinux.info
=== modified file 'ChangeLog'
--- ChangeLog 2009-12-19 23:00:30 +0000
+++ ChangeLog 2009-12-20 01:35:50 +0000
@@ -1,3 +1,29 @@
+2009-12-20 Carles Pina i Estany <car...@pina.cat>
+
+ * include/grub/auth.h (GRUB_GET_PASSWORD): Remove space from string.
+ * include/grub/normal.h (grub_utf8_to_ucs4_alloc): Fix indentation.
+ (grub_print_ucs4): Likewise.
+ (grub_getstringwidth): Likewise.
+ (print_message_indented): New declaration.
+ * normal/auth.c: Include `<grub/i18n.h>'.
+ (grub_auth_check_authentication): Gettexttize string.
+ * normal/cmdline.c (grub_cmdline_get): Add space.
+ * normal/color.c: Include `<grub/i18n.h>'.
+ (grub_parse_color_name_pair): Gettexttize strings.
+ * normal/main.c (grub_normal_reader_init): Cleanup gettexttized
+ string (use `print_message_indented').
+ (grub_normal_read_line): Remove space.
+ * normal/menu_text.c (print_message_indented): Renamed to ...
+ (grub_print_message_indented): ... this. Remove `static' qualifer (now
+ used in normal/main.c).
+ (print_message): Use `grub_print_message_indented' instead of
+ `print_message_indented'.
+ (print_timeout): Likewise.
+ * normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
+ (grub_normal_print_device_info): Gettexttize strings. Replace
+ grub_printf by grub_putchar.
+ * po/POTFILES: Add `auth.c', `color.c' and `misc.c'.
+
2009-12-19 Carles Pina i Estany <car...@pina.cat>
* include/grub/normal.h (grub_utf8_to_ucs4): New declaration.
=== modified file 'include/grub/auth.h'
--- include/grub/auth.h 2009-08-24 23:55:06 +0000
+++ include/grub/auth.h 2009-12-19 23:06:06 +0000
@@ -22,7 +22,7 @@
/* Macros for indistinguishibility. */
#define GRUB_ACCESS_DENIED grub_error (GRUB_ERR_ACCESS_DENIED, "Access denied.")
-#define GRUB_GET_PASSWORD(string, len) grub_cmdline_get ("Enter password: ", \
+#define GRUB_GET_PASSWORD(string, len) grub_cmdline_get ("Enter password:", \
string, len, \
'*', 0, 0)
=== modified file 'include/grub/normal.h'
--- include/grub/normal.h 2009-12-19 23:00:30 +0000
+++ include/grub/normal.h 2009-12-20 01:33:53 +0000
@@ -74,11 +74,13 @@ void grub_parse_color_name_pair (grub_ui
/* Defined in `menu_text.c'. */
void grub_wait_after_message (void);
int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
- grub_uint32_t **last_position);
+ grub_uint32_t **last_position);
void grub_print_ucs4 (const grub_uint32_t * str,
- const grub_uint32_t * last_position);
+ const grub_uint32_t * last_position);
grub_ssize_t grub_getstringwidth (grub_uint32_t * str,
- const grub_uint32_t * last_position);
+ const grub_uint32_t * last_position);
+void grub_print_message_indented (const char *msg, int margin_left,
+ int margin_right);
/* Defined in `handler.c'. */
void read_handler_list (void);
=== modified file 'normal/auth.c'
--- normal/auth.c 2009-11-09 14:30:47 +0000
+++ normal/auth.c 2009-12-19 23:06:06 +0000
@@ -23,6 +23,7 @@
#include <grub/env.h>
#include <grub/normal.h>
#include <grub/time.h>
+#include <grub/i18n.h>
struct grub_auth_user
{
@@ -237,7 +238,7 @@ grub_auth_check_authentication (const ch
return GRUB_ERR_NONE;
}
- if (!grub_cmdline_get ("Enter username: ", login, sizeof (login) - 1,
+ if (!grub_cmdline_get (_("Enter username:"), login, sizeof (login) - 1,
0, 0, 0))
goto access_denied;
=== modified file 'normal/cmdline.c'
--- normal/cmdline.c 2009-08-28 13:25:10 +0000
+++ normal/cmdline.c 2009-12-19 23:06:06 +0000
@@ -334,7 +334,7 @@ grub_cmdline_get (const char *prompt, ch
if (restore)
{
/* Restore the prompt. */
- grub_printf ("\n%s%s", prompt, buf);
+ grub_printf ("\n%s %s", prompt, buf);
xpos = plen;
ystart = ypos = (grub_getxy () & 0xFF);
}
=== modified file 'normal/color.c'
--- normal/color.c 2008-03-26 13:01:02 +0000
+++ normal/color.c 2009-12-19 23:06:06 +0000
@@ -20,6 +20,7 @@
#include <grub/mm.h>
#include <grub/normal.h>
#include <grub/term.h>
+#include <grub/i18n.h>
/* Borrowed from GRUB Legacy */
static char *color_list[16] =
@@ -76,7 +77,7 @@ grub_parse_color_name_pair (grub_uint8_t
bg_name = grub_strchr (fg_name, '/');
if (bg_name == NULL)
{
- grub_printf ("Warning: syntax error (missing slash) in `%s'\n", fg_name);
+ grub_printf_ (N_("Warning: syntax error (missing slash) in `%s'\n"), fg_name);
grub_wait_after_message ();
goto free_and_return;
}
@@ -85,13 +86,13 @@ grub_parse_color_name_pair (grub_uint8_t
if (parse_color_name (&fg, fg_name) == -1)
{
- grub_printf ("Warning: invalid foreground color `%s'\n", fg_name);
+ grub_printf_ (N_("Warning: invalid foreground color `%s'\n"), fg_name);
grub_wait_after_message ();
goto free_and_return;
}
if (parse_color_name (&bg, bg_name) == -1)
{
- grub_printf ("Warning: invalid background color `%s'\n", bg_name);
+ grub_printf_ (N_("Warning: invalid background color `%s'\n"), bg_name);
grub_wait_after_message ();
goto free_and_return;
}
=== modified file 'normal/main.c'
--- normal/main.c 2009-12-19 23:00:30 +0000
+++ normal/main.c 2009-12-20 01:17:47 +0000
@@ -522,12 +522,21 @@ grub_normal_reader_init (void)
grub_normal_init_page ();
grub_setcursor (1);
- grub_printf_ (N_("\
- [ Minimal BASH-like line editing is supported. For the first word, TAB\n\
- lists possible command completions. Anywhere else TAB lists possible\n\
- device/file completions.%s ]\n\n"),
- reader_nested ? " ESC at any time exits." : "");
+ const char *msg = _("Minimal BASH-like line editing is supported. For \
+the first word, TAB lists possible command completions. Anywhere else TAB \
+lists possible device/file completions. %s");
+ const char *msg_esc = _("ESC at any time exits.");
+
+ char *msg_formatted = grub_malloc (sizeof (char) * (grub_strlen (msg) +
+ grub_strlen(msg_esc) + 1));
+
+ grub_sprintf (msg_formatted, msg, reader_nested ? msg_esc : "");
+ grub_print_message_indented (msg_formatted, 6, 6);
+ grub_puts ("\n");
+
+ grub_free (msg_formatted);
+
return 0;
}
@@ -537,9 +546,9 @@ static grub_err_t
grub_normal_read_line (char **line, int cont)
{
grub_parser_t parser = grub_parser_get_current ();
- char prompt[sizeof("> ") + grub_strlen (parser->name)];
+ char prompt[sizeof(">") + grub_strlen (parser->name)];
- grub_sprintf (prompt, "%s> ", parser->name);
+ grub_sprintf (prompt, "%s>", parser->name);
while (1)
{
=== modified file 'normal/menu_text.c'
--- normal/menu_text.c 2009-12-19 23:00:30 +0000
+++ normal/menu_text.c 2009-12-19 23:11:05 +0000
@@ -106,8 +106,8 @@ grub_getstringwidth (grub_uint32_t * str
return width;
}
-static void
-print_message_indented (const char *msg, int margin_left, int margin_right)
+void
+grub_print_message_indented (const char *msg, int margin_left, int margin_right)
{
int line_len;
line_len = GRUB_TERM_WIDTH - grub_getcharwidth ('m') *
@@ -206,7 +206,7 @@ print_message (int nested, int edit)
if (edit)
{
grub_putchar ('\n');
- print_message_indented (_("Minimum Emacs-like screen editing is \
+ grub_print_message_indented (_("Minimum Emacs-like screen editing is \
supported. TAB lists completions. Press Ctrl-x to boot, Ctrl-c for a \
command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN);
}
@@ -220,11 +220,11 @@ entry is highlighted.\n");
grub_sprintf (msg_translated, msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
(grub_uint32_t) GRUB_TERM_DISP_DOWN);
grub_putchar ('\n');
- print_message_indented (msg_translated, STANDARD_MARGIN, STANDARD_MARGIN);
+ grub_print_message_indented (msg_translated, STANDARD_MARGIN, STANDARD_MARGIN);
grub_free (msg_translated);
- print_message_indented (_("Press enter to boot the selected OS, \
+ grub_print_message_indented (_("Press enter to boot the selected OS, \
\'e\' to edit the commands before booting or \'c\' for a command-line.\n"), STANDARD_MARGIN, STANDARD_MARGIN);
if (nested)
@@ -403,7 +403,7 @@ print_timeout (int timeout, int offset)
grub_malloc (sizeof (char) * grub_strlen (msg) + 5);
grub_sprintf (msg_translated, msg, timeout);
- print_message_indented (msg_translated, 3, 0);
+ grub_print_message_indented (msg_translated, 3, 0);
int posx;
posx = grub_getxy() >> 8;
=== modified file 'normal/misc.c'
--- normal/misc.c 2009-12-18 03:56:03 +0000
+++ normal/misc.c 2009-12-20 01:33:26 +0000
@@ -24,6 +24,8 @@
#include <grub/misc.h>
#include <grub/mm.h>
#include <grub/datetime.h>
+#include <grub/term.h>
+#include <grub/i18n.h>
/* Print the information on the device NAME. */
grub_err_t
@@ -34,13 +36,20 @@ grub_normal_print_device_info (const cha
p = grub_strchr (name, ',');
if (p)
- grub_printf ("\tPartition %s: ", name);
+ {
+ grub_putchar ('\t');
+ grub_printf_ (N_("Partition %s:"), name);
+ grub_putchar (' ');
+ }
else
- grub_printf ("Device %s: ", name);
+ {
+ grub_printf_ (N_("Device %s:"), name);
+ grub_putchar (' ');
+ }
dev = grub_device_open (name);
if (! dev)
- grub_printf ("Filesystem cannot be accessed");
+ grub_puts_ (N_("Filesystem cannot be accessed"));
else if (dev->disk)
{
grub_fs_t fs;
@@ -51,7 +60,7 @@ grub_normal_print_device_info (const cha
if (fs)
{
- grub_printf ("Filesystem type %s", fs->name);
+ grub_printf_ (N_("Filesystem type %s"), fs->name);
if (fs->label)
{
char *label;
@@ -59,7 +68,7 @@ grub_normal_print_device_info (const cha
if (grub_errno == GRUB_ERR_NONE)
{
if (label && grub_strlen (label))
- grub_printf (", Label %s", label);
+ grub_printf_ (N_("- Label %s"), label);
grub_free (label);
}
grub_errno = GRUB_ERR_NONE;
@@ -72,8 +81,8 @@ grub_normal_print_device_info (const cha
if (grub_errno == GRUB_ERR_NONE)
{
grub_unixtime2datetime (tm, &datetime);
- grub_printf (", Last modification time %d-%02d-%02d "
- "%02d:%02d:%02d %s",
+ grub_printf_ (N_("- Last modification time %d-%02d-%02d "
+ "%02d:%02d:%02d %s"),
datetime.year, datetime.month, datetime.day,
datetime.hour, datetime.minute, datetime.second,
grub_get_weekday_name (&datetime));
@@ -95,13 +104,13 @@ grub_normal_print_device_info (const cha
}
}
else if (! dev->disk->has_partitions || dev->disk->partition)
- grub_printf ("Unknown filesystem");
+ grub_puts_ (N_("Unknown filesystem"));
else
- grub_printf ("Partition table");
+ grub_puts_ (N_("Partition table"));
grub_device_close (dev);
}
- grub_printf ("\n");
+ grub_putchar ('\n');
return grub_errno;
}
=== modified file 'po/POTFILES'
--- po/POTFILES 2009-12-19 23:00:30 +0000
+++ po/POTFILES 2009-12-19 23:06:38 +0000
@@ -11,6 +11,9 @@ util/mkisofs/rock.c
util/mkisofs/tree.c
util/mkisofs/write.c
+normal/auth.c
+normal/color.c
normal/main.c
normal/menu_entry.c
normal/menu_text.c
+normal/misc.c
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
