merge mainline into crypto

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-22 14:28:39 +01:00
commit ba136b293a
165 changed files with 4910 additions and 1858 deletions

View file

@ -23,6 +23,7 @@
#include <grub/env.h>
#include <grub/normal.h>
#include <grub/time.h>
#include <grub/i18n.h>
struct grub_auth_user
{
@ -186,7 +187,7 @@ grub_auth_check_authentication (const char *userlist)
return GRUB_ERR_NONE;
}
if (!grub_cmdline_get ("Enter username: ", login, sizeof (login) - 1,
if (!grub_cmdline_get (N_("Enter username:"), login, sizeof (login) - 1,
0, 0, 0))
goto access_denied;