[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeadmin/lilo-config
From: Andrew Coles <andrew_coles () yahoo ! co ! uk>
Date: 2009-11-23 0:10:39
Message-ID: 1258935039.431896.6758.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1053024 by coles:
Proof-reading: checking older strings are consistent with more recent KDE \
developments.
M +2 -2 kde-qt-common/general.cpp
M +10 -10 kde-qt-common/images.cpp
M +2 -2 kde/Details.cpp
M +3 -3 qt/Details.cpp
--- trunk/KDE/kdeadmin/lilo-config/kde-qt-common/general.cpp #1053023:1053024
@@ -70,7 +70,7 @@
KHBox *modes=new KHBox(this);
linear=new QCheckBox(_("Use &linear mode"), modes);
connect(linear, SIGNAL(clicked()), SIGNAL(configChanged()));
- linear->setWhatsThis( _("Check this box if you want to use the linear \
mode.<br>Linear mode tells the boot loader the location of kernels in linear \
addressing rather than sector/head/cylinder.<br>linear mode is required for some SCSI \
drives, and shouldn't hurt unless you're planning to create a boot disk to be used \
with a different computer.<br>See the lilo.conf man page for details.")); \
+ linear->setWhatsThis( _("Check this box if you want to use the linear \
mode.<br>Linear mode tells the boot loader the location of kernels in linear \
addressing rather than sector/head/cylinder.<br>Linear mode is required for some SCSI \
drives, and should not cause problems unless you are planning to create a boot disk \
to be used with a different computer.<br>See the lilo.conf man page for details.")); \
compact=new QCheckBox(_("Use &compact mode"), modes); connect(compact, \
SIGNAL(clicked()), SIGNAL(configChanged())); compact->setWhatsThis( _("Check this \
box if you want to use the compact mode.<br>The compact mode tries to merge read \
requests for adjacent sectors into a single read request. This reduces load time and \
keeps the boot map smaller, but will not work on all systems.")); @@ -94,7 +94,7 @@
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
connect(password, SIGNAL(textChanged(const QString &)), SIGNAL(configChanged()));
- pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If \
<i>restricted</i> above is checked, the password is required for additional \
parameters only.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, \
you probably don't want to use your normal/root password here.<br>This sets a default \
for all Linux kernels you want to boot. If you need a per-kernel setting, go to the \
<i>Operating systems</i> tab and select <i>Details</i>.")); + pw->setWhatsThis( \
_("Enter the password required for bootup (if any) here. If <i>restricted</i> is \
checked above, the password is only required for additional \
parameters.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you \
probably do not want to use your normal/root password here.<br>This sets a default \
for all Linux kernels you want to boot. If you need a per-kernel setting, go to the \
<i>Operating systems</i> tab and select <i>Details</i>.")); layout->addWidget(pw);
KHBox *vgab=new KHBox(this);
--- trunk/KDE/kdeadmin/lilo-config/kde-qt-common/images.cpp #1053023:1053024
@@ -70,7 +70,7 @@
root->setWhatsThis( _("Enter the root filesystem (i.e. the partition that will be \
mounted as / at boot time) for the kernel you want to boot here.")); connect(root, \
SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged())); initrd=new \
EditWidget(_("&Initial ramdisk:"), "", true, parameters);
- initrd->setWhatsThis( _("If you want to use an initial ramdisk (initrd) for this \
kernel, enter its filename here. Leave this field blank if you don't intend to use an \
initial ramdisk for this kernel.")); + initrd->setWhatsThis( _("If you want to use an \
initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field \
blank if you do not intend to use an initial ramdisk for this kernel.")); \
connect(initrd, SIGNAL(textChanged(const QString &)), this, SIGNAL(configChanged())); \
append=new EditWidget(_("E&xtra parameters:"), "", false, parameters); \
append->setWhatsThis( _("Enter any extra parameters you wish to pass to the kernel \
here. Usually, this can be left blank.<br>This sets the <i>append</i> option in \
lilo.conf.")); @@ -81,7 +81,7 @@
actions->setSpacing(SPACE_INSIDE);
layout->addWidget(actions);
dflt=new QPushButton(_("Set &Default"), actions);
- dflt->setWhatsThis( _("Boot this kernel/OS if the user doesn't make a different \
choice")); + dflt->setWhatsThis( _("Boot this kernel/OS if the user does not make a \
different choice")); connect(dflt, SIGNAL(clicked()), SLOT(dfltClicked()));
details=new QPushButton(_("De&tails"), actions);
details->setWhatsThis( _("This button brings up a dialog box with further, less \
commonly used, options.")); @@ -91,7 +91,7 @@
probe->setWhatsThis( _("Automatically generate a (hopefully) reasonable lilo.conf \
for your system")); check=new QPushButton(_("&Check Configuration"), actions);
connect(check, SIGNAL(clicked()), SLOT(checkClicked()));
- check->setWhatsThis( _("Run LILO in test mode to see if the configuration is ok"));
+ check->setWhatsThis( _("Run LILO in test mode to see if the configuration is \
okay.")); addKrnl=new QPushButton(_("Add &Kernel..."), actions);
connect(addKrnl, SIGNAL(clicked()), SLOT(addKrnlClicked()));
addKrnl->setWhatsThis( _("Add a new Linux kernel to the boot menu"));
@@ -179,11 +179,11 @@
{
QString LiloOut=lilo->liloOut().cstr();
if(lilo->isOk()) {
- LiloOut=_("Configuration ok. LILO said:\n")+LiloOut;
- InformationOK(this, LiloOut, _("Configuration OK"), "lilo-config.confOK");
+ LiloOut=_("Configuration okay. LILO reported:\n")+LiloOut;
+ InformationOK(this, LiloOut, _("Configuration Okay"), "lilo-config.confOK");
} else {
- LiloOut=_("Configuration NOT ok. LILO said:\n")+LiloOut;
- ErrorOK(this, _("Configuration NOT ok"), LiloOut);
+ LiloOut=_("Configuration NOT okay. LILO reported:\n")+LiloOut;
+ ErrorOK(this, _("Configuration NOT Okay"), LiloOut);
}
}
void Images::addKrnlClicked() // SLOT
@@ -192,7 +192,7 @@
InputBox::entry l0={ _("&Kernel filename:"), "", true, _("Enter the filename of the \
kernel you want to boot here.") }; InputBox::entry l1={ _("&Label:"), "", false, \
_("Enter the label (name) of the kernel you want to boot here.") }; InputBox::entry \
l2={ _("&Root filesystem:"), "", true, _("Enter the root filesystem (i.e. the \
partition that will be mounted as / at boot time) for the kernel you want to boot \
here.") };
- InputBox::entry l3={ _("&Initial ramdisk:"), "", true, _("If you want to use an \
initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field \
blank if you don't intend to use an initial ramdisk for this kernel.") }; \
+ InputBox::entry l3={ _("&Initial ramdisk:"), "", true, _("If you want to use an \
initial ramdisk (initrd) for this kernel, enter its filename here. Leave this field \
blank if you do not intend to use an initial ramdisk for this kernel.") }; \
e.insert(e.end(), l0); e.insert(e.end(), l1);
e.insert(e.end(), l2);
@@ -217,8 +217,8 @@
void Images::addOSClicked() // SLOT
{
InputBox::entries e;
- InputBox::entry l0={_("Boot from dis&k:"), "", true, _("Enter the partition \
containing the operating system you'd like to boot here.") };
- InputBox::entry l1={_("&Label:"), "", false, _("Enter the label (name) of the \
operating system here.") }; + InputBox::entry l0={_("Boot from dis&k:"), "", true, \
_("Enter here the partition containing the operating system you would like to boot.") \
}; + InputBox::entry l1={_("&Label:"), "", false, _("Enter here the label (name) of \
the operating system.") }; e.insert(e.end(), l0);
e.insert(e.end(), l1);
InputBox *label=new InputBox(e, this);
--- trunk/KDE/kdeadmin/lilo-config/kde/Details.cpp #1053023:1053024
@@ -76,7 +76,7 @@
vga->insertItem(_("VGA 1280x1024, 16.7M colors (795)"));
readonly=new QCheckBox(_("Mount root filesystem &read-only"), page);
- readonly->setWhatsThis( _("Mount the root filesystem for this kernel read-only. \
Since the init scripts normally take care of remounting the root filesystem in \
read-write mode after running some checks, this should always be turned on.<br>Don't \
turn this off unless you know what you're doing.")); + readonly->setWhatsThis( \
_("Mount the root filesystem for this kernel read-only. Since the init scripts \
normally take care of remounting the root filesystem in read-write mode after running \
some checks, this should always be turned on.<br>Do not turn this off unless you know \
what you are doing."));
unsafe=new QCheckBox(_("Do not check &partition table"), page);
unsafe->setWhatsThis( _("This turns off some sanity checks while writing the \
configuration. This should not be used under \"normal\" circumstances, but it can be \
useful, for example, by providing the capability of booting from a floppy disk, \
without having a floppy in the drive every time you run lilo.<br>This sets the \
<i>unsafe</i> keyword in lilo.conf.")); @@ -94,7 +94,7 @@
password=new QLineEdit(pw);
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
- pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If \
<i>restricted</i> above is checked, the password is required for additional \
parameters only.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, \
you probably don't want to use your normal/root password here.")); \
+ pw->setWhatsThis( _("Enter the password required for bootup (if any) here. If \
<i>restricted</i> above is checked, the password is required for additional \
parameters only.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you \
probably do not want to use your normal/root password here."));
if(l) {
QString mode=l->get("vga", "").cstr();
--- trunk/KDE/kdeadmin/lilo-config/qt/Details.cpp #1053023:1053024
@@ -74,11 +74,11 @@
layout->addWidget(vgab);
readonly=new QCheckBox(_("Mount root filesystem &read-only"), this);
- QWhatsThis::add(readonly, _("Mount the root filesystem for this kernel read-only. \
Since the init scripts normally take care of remounting the root filesystem in \
read-write mode after running some checks, this should always be turned on.<br>Don't \
turn this off unless you know what you're doing.")); + QWhatsThis::add(readonly, \
_("Mount the root filesystem for this kernel read-only. Since the init scripts \
normally take care of remounting the root filesystem in read-write mode after running \
some checks, this should always be turned on.<br>Do not turn this off unless you know \
what you are doing.")); layout->addWidget(readonly);
unsafe=new QCheckBox(_("Do not check &partition table"), this);
- QWhatsThis::add(unsafe, _("This turns off some sanity checks while writing the \
configuration. This shouldn't be used under \"normal\" circumstances, but it's \
useful, for example, for installing the possibility to boot from a floppy disk \
without having a floppy in the drive every time you run lilo.<br>This sets the \
<i>unsafe</i> keyword in lilo.conf.")); + QWhatsThis::add(unsafe, _("This turns off \
some sanity checks while writing the configuration. This should not be used under \
\"normal\" circumstances, but it is useful, for example, for installing the \
possibility to boot from a floppy disk without having a floppy in the drive every \
time you run lilo.<br>This sets the <i>unsafe</i> keyword in lilo.conf.")); \
layout->addWidget(unsafe);
QHBox *opts=new QHBox(this);
@@ -95,7 +95,7 @@
password=new QLineEdit(pw);
password->setMaxLength(15);
password->setEchoMode(QLineEdit::Password);
- QWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If \
<i>restricted</i> above is checked, the password is required for additional \
parameters only.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. You'll want to make sure nobody untrusted can read this file. Also, \
you probably don't want to use your normal/root password here.")); \
+ QWhatsThis::add(pw, _("Enter the password required for bootup (if any) here. If \
<i>restricted</i> above is checked, the password is required for additional \
parameters only.<br><b>WARNING:</b> The password is stored in clear text in \
/etc/lilo.conf. Make sure that nobody untrusted can read this file. Also, you \
probably do not want to use your normal/root password here.")); \
layout->addWidget(pw);
QHBox *btns=new QHBox(this);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic