commit 8fe55f96b5fc21e53a7390202e2028f015be5da3
author Dominik Riebeling <Dominik.Riebeling@gmail.com> Sun Dec 14 12:36:35 2008 +0000
committer Dominik Riebeling <Dominik.Riebeling@gmail.com> Sun Dec 14 12:36:35 2008 +0000
tree 3c2f923cbee0852d2da1899ec7b94bd560014395
parent 26bf32c8aacb115528fafae552d576227b08ea7a

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

diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
index d0abffa..831bc46 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
@@ -148,7 +148,7 @@
             "Installation <b>requires</b> you to perform the "
             "following steps manually:");
 
-    msg += tr("<ol>");
+    msg += "<ol>";
     msg += tr("<li>Safely remove your player.</li>");
     if(model == "h100" || model == "h120" || model == "h300") {
         hint = true;

rbutil/rbutilqt/base/bootloaderinstallipod.cpp

diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index e47c96b..037b695 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -102,7 +102,7 @@
     }
 
     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 @@
     }
 
     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 @@
     }
 
     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;

rbutil/rbutilqt/installfrm.ui

diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui
index c1a6b82..bdb42d7 100644
--- a/rbutil/rbutilqt/installfrm.ui
+++ b/rbutil/rbutilqt/installfrm.ui
@@ -204,11 +204,7 @@
          </size>
         </property>
         <property name="text" >
-         <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-&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>
+         <string>Backup Location</string>
         </property>
        </widget>
       </item>