From: Vladimir 'phcoder' Serbinenko Date: Thu, 3 May 2012 21:43:59 +0000 (+0200) Subject: * grub-core/commands/menuentry.c: Add TRANSLATORS comments. X-Git-Tag: 2.00~262 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11858300e96d0e96398150f88ca6b79138ecdadb;p=thirdparty%2Fgrub.git * grub-core/commands/menuentry.c: Add TRANSLATORS comments. * grub-core/kern/emu/hostdisk.c: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 644a149cf..e9c79327b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-03 Samuel Thibault + + * grub-core/commands/menuentry.c: Add TRANSLATORS comments. + * grub-core/kern/emu/hostdisk.c: Likewise. + 2012-05-03 Samuel Thibault Handle hurd userspace partitions. diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c index a1a7e52ee..af63bb2a0 100644 --- a/grub-core/commands/menuentry.c +++ b/grub-core/commands/menuentry.c @@ -37,6 +37,10 @@ static const struct grub_arg_option options[] = {"source", 4, 0, N_("Use STRING as menu entry body."), N_("STRING"), ARG_TYPE_STRING}, {"id", 0, 0, N_("Menu entry identifier."), N_("STRING"), ARG_TYPE_STRING}, + /* TRANSLATORS: menu entry can either be bootable by anyone or only by + handful of users. By default when security is active only superusers can + boot a given only superusers. With --unrestricted (this option) + anyone can boot it. */ {"unrestricted", 0, 0, N_("This entry can be booted by any user."), 0, ARG_TYPE_NONE}, {0, 0, 0, 0, 0, 0} diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c index ccd7f579f..706a1158c 100644 --- a/grub-core/kern/emu/hostdisk.c +++ b/grub-core/kern/emu/hostdisk.c @@ -1301,7 +1301,12 @@ read_device_map (const char *dev_map) strcpy (map[drive].drive + sizeof ("hostdisk/") - 1, p); c = *drive_p; *drive_p = 0; - grub_util_warn (_("the drive name %s in device.map is incorrect. " + /* TRANSLATORS: device.map is a filename. Not to be translated. + device.map specifies disk correspondance overrides. Previously + one could create any kind of device name with this. Due to + some problems we decided to limit it to just a handful + possibilities. */ + grub_util_warn (_("the drive name `%s' in device.map is incorrect. " "Using %s instead. " "Please use the form [hfc]d[0-9]* " "(E.g. `hd0' or `cd')"),