summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-01-19 23:16:43 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-01-19 23:16:43 +0000
commit92042548a25101813dadc64e45ba987a1cc46210 (patch)
treeef00e488db636df4df16ce7354698c4d5ef59911 /rbutil
parentfd3abfc6c7e4f188c32fc5304bf4eb7ea8e30574 (diff)
downloadrockbox-92042548a25101813dadc64e45ba987a1cc46210.tar.gz
rockbox-92042548a25101813dadc64e45ba987a1cc46210.tar.bz2
rockbox-92042548a25101813dadc64e45ba987a1cc46210.zip
Make Rockbox Utility build again and make some strings translatable. Break some long lines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24293 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallams.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
index 24fb3eb490..12698c221b 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
@@ -94,7 +94,8 @@ void BootloaderInstallAms::installStage2(void)
}
/* Load bootloader file */
- rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), sum.model, &bootloader_size,&rb_packedsize,
+ rb_packed = load_rockbox_file(bootfile.toLocal8Bit().data(), sum.model,
+ &bootloader_size,&rb_packedsize,
errstr,sizeof(errstr));
if (rb_packed == NULL)
{
@@ -112,7 +113,8 @@ void BootloaderInstallAms::installStage2(void)
if (totalsize > firmware_size)
{
qDebug() << "[BootloaderInstallAms] No room to insert bootloader";
- emit logItem("No room to insert bootloader, try another firmware version",LOGERROR);
+ emit logItem(tr("No room to insert bootloader, try another firmware version"),
+ LOGERROR);
free(buf);
free(of_packed);
free(rb_packed);
@@ -123,14 +125,15 @@ void BootloaderInstallAms::installStage2(void)
/* patch the firmware */
emit logItem(tr("Patching Firmware..."), LOGINFO);
- patch_firmware(sum.model,firmware_revision(sum.model),firmware_size,buf,len,of_packed,of_packedsize,rb_packed,rb_packedsize);
+ patch_firmware(sum.model,firmware_revision(sum.model),firmware_size,buf,
+ len,of_packed,of_packedsize,rb_packed,rb_packedsize);
/* write out file */
QFile out(m_blfile);
if(!out.open(QIODevice::WriteOnly | QIODevice::Truncate))
{
- qDebug() << "[BootloaderInstallAms] Could not open" << m_blfile "for writing";
+ qDebug() << "[BootloaderInstallAms] Could not open" << m_blfile << "for writing";
emit logItem(tr("Could not open %1 for writing").arg(m_blfile),LOGERROR);
free(buf);
free(of_packed);
@@ -168,7 +171,8 @@ void BootloaderInstallAms::installStage2(void)
bool BootloaderInstallAms::uninstall(void)
{
- emit logItem("To uninstall, perform a normal upgrade with an unmodified original firmware", LOGINFO);
+ emit logItem(tr("To uninstall, perform a normal upgrade with an unmodified "
+ "original firmware"), LOGINFO);
logInstall(LogRemove);
return false;
}
@@ -182,3 +186,4 @@ BootloaderInstallBase::Capabilities BootloaderInstallAms::capabilities(void)
{
return (Install | NeedsOf);
}
+