From 8fe55f96b5fc21e53a7390202e2028f015be5da3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 14 Dec 2008 12:36:35 +0000 Subject: [PATCH] Various small rbutil source string cleanups. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19436 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/base/bootloaderinstallbase.cpp | 2 +- rbutil/rbutilqt/base/bootloaderinstallipod.cpp | 8 ++++---- rbutil/rbutilqt/installfrm.ui | 6 +----- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp index d0abffa44d..831bc46db0 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp @@ -148,7 +148,7 @@ QString BootloaderInstallBase::postinstallHints(QString model) "Installation requires you to perform the " "following steps manually:"); - msg += tr("
    "); + msg += "
      "; msg += tr("
    1. Safely remove your player.
    2. "); if(model == "h100" || model == "h120" || model == "h300") { hint = true; diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp index e47c96b239..037b695e88 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp @@ -102,7 +102,7 @@ void BootloaderInstallIpod::installStage2(void) } 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); emit done(true); return; @@ -158,7 +158,7 @@ bool BootloaderInstallIpod::uninstall(void) } 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); return false; } @@ -170,14 +170,14 @@ bool BootloaderInstallIpod::uninstall(void) } if (delete_bootloader(&ipod)==0) { - emit logItem(tr("Successfully removed Bootloader"), LOGOK); + emit logItem(tr("Successfully removed bootloader"), LOGOK); logInstall(LogRemove); emit done(false); ipod_close(&ipod); return true; } else { - emit logItem(tr("Removing the bootloader failed."), LOGERROR); + emit logItem(tr("Removing bootloader failed."), LOGERROR); emit done(true); ipod_close(&ipod); return false; diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui index c1a6b82a1e..bdb42d765d 100644 --- a/rbutil/rbutilqt/installfrm.ui +++ b/rbutil/rbutilqt/installfrm.ui @@ -204,11 +204,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Backup Location:</span></p></body></html> + Backup Location