devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Various small rbutil source string cleanups.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19436 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2008-12-14 12:36:35 +00:00
parent 26bf32c8aa
commit 8fe55f96b5
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/base/bootloaderinstallbase.cpp
View file

@ -148,7 +148,7 @@ QString BootloaderInstallBase::postinstallHints(QString model)
"Installation <b>requires</b> you to perform the " "Installation <b>requires</b> you to perform the "
"following steps manually:"); "following steps manually:");
msg += tr("<ol>"); msg += "<ol>";
msg += tr("<li>Safely remove your player.</li>"); msg += tr("<li>Safely remove your player.</li>");
if(model == "h100" || model == "h120" || model == "h300") { if(model == "h100" || model == "h120" || model == "h300") {
hint = true; hint = true;

8
rbutil/rbutilqt/base/bootloaderinstallipod.cpp
View file

@ -102,7 +102,7 @@ void BootloaderInstallIpod::installStage2(void)
} }
if(ipod.macpod) { if(ipod.macpod) {
emit logItem(tr("Warning: This is a MacPod. Rockbox only runs on WinPods.\n" emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods.\n"
"See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR); "See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR);
emit done(true); emit done(true);
return; return;
@ -158,7 +158,7 @@ bool BootloaderInstallIpod::uninstall(void)
} }
if (ipod_reopen_rw(&ipod) < 0) { if (ipod_reopen_rw(&ipod) < 0) {
emit logItem(tr("Could not open Ipod in RW mode"), LOGERROR); emit logItem(tr("Could not open Ipod in R/W mode"), LOGERROR);
emit done(true); emit done(true);
return false; return false;
} }
@ -170,14 +170,14 @@ bool BootloaderInstallIpod::uninstall(void)
} }
if (delete_bootloader(&ipod)==0) { if (delete_bootloader(&ipod)==0) {
emit logItem(tr("Successfully removed Bootloader"), LOGOK); emit logItem(tr("Successfully removed bootloader"), LOGOK);
logInstall(LogRemove); logInstall(LogRemove);
emit done(false); emit done(false);
ipod_close(&ipod); ipod_close(&ipod);
return true; return true;
} }
else { else {
emit logItem(tr("Removing the bootloader failed."), LOGERROR); emit logItem(tr("Removing bootloader failed."), LOGERROR);
emit done(true); emit done(true);
ipod_close(&ipod); ipod_close(&ipod);
return false; return false;

6
rbutil/rbutilqt/installfrm.ui
View file

@ -204,11 +204,7 @@
</size> </size>
</property> </property>
<property name="text" > <property name="text" >
<string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <string>Backup Location</string>
&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
p, li { white-space: pre-wrap; }
&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:8pt; font-weight:600;">Backup Location:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
</property> </property>
</widget> </widget>
</item> </item>