Fix some source strings to clean up translations.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17947 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 47 insertions, 40 deletions

diff --git a/rbutil/rbutilqt/createvoicewindow.cpp b/rbutil/rbutilqt/createvoicewindow.cpp
index f860e697ff..bb047cb196 100644
--- a/rbutil/rbutilqt/createvoicewindow.cpp
+++ b/rbutil/rbutilqt/createvoicewindow.cpp
@@ -101,9 +101,11 @@ void CreateVoiceWindow::updateSettings(void)
     TTSBase* tts = TTSBase::getTTS(ttsName);
     tts->setCfg(settings);
     if(tts->configOk())
-        ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(TTSBase::getTTSName(ttsName)));
+        ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
+            .arg(TTSBase::getTTSName(ttsName)));
     else
-        ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!"));
+        ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
+            .arg("Invalid TTS configuration!"));
     
     QString encoder = settings->curEncoder();
     // only proceed if encoder setting is set
@@ -111,12 +113,15 @@ void CreateVoiceWindow::updateSettings(void)
     if(enc != NULL) {
         enc->setCfg(settings);
         if(enc->configOk())
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(EncBase::getEncoderName(encoder)));
+            ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+                .arg(EncBase::getEncoderName(encoder)));
         else
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
+            ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+                .arg("Invalid encoder configuration!"));
     }
     else
-        ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
+        ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+            .arg("Invalid encoder configuration!"));
     ui.wavtrimthreshold->setValue(settings->wavtrimTh());
     emit settingsUpdated();
 }
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp
index 16b3b83f21..c3381f356b 100644
--- a/rbutil/rbutilqt/installtalkwindow.cpp
+++ b/rbutil/rbutilqt/installtalkwindow.cpp
@@ -121,21 +121,26 @@ void InstallTalkWindow::updateSettings(void)
     TTSBase* tts = TTSBase::getTTS(ttsName);
     tts->setCfg(settings);
     if(tts->configOk())
-        ui.labelTtsProfile->setText(tr("Selected TTS engine : <b>%1</b>").arg(TTSBase::getTTSName(ttsName)));
+        ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
+            .arg(TTSBase::getTTSName(ttsName)));
     else
-        ui.labelTtsProfile->setText(tr("Selected TTS Engine: <b>%1</b>").arg("Invalid TTS configuration!"));
+        ui.labelTtsProfile->setText(tr("Selected TTS engine: <b>%1</b>")
+            .arg("Invalid TTS configuration!"));
     
     QString encoder = settings->curEncoder();
     EncBase* enc = EncBase::getEncoder(encoder);
     if(enc != NULL) {
         enc->setCfg(settings);
         if(enc->configOk())
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg(EncBase::getEncoderName(encoder)));
+            ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+                .arg(EncBase::getEncoderName(encoder)));
         else
-            ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
+            ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+                .arg("Invalid encoder configuration!"));
     }
     else
-        ui.labelEncProfile->setText(tr("Selected Encoder: <b>%1</b>").arg("Invalid encoder configuration!"));
+        ui.labelEncProfile->setText(tr("Selected encoder: <b>%1</b>")
+            .arg("Invalid encoder configuration!"));
 
     setTalkFolder(settings->lastTalkedFolder());
     emit settingsUpdated();
diff --git a/rbutil/rbutilqt/rbutil_de.ts b/rbutil/rbutilqt/rbutil_de.ts
index acdad58750..127b23351e 100644
--- a/rbutil/rbutilqt/rbutil_de.ts
+++ b/rbutil/rbutilqt/rbutil_de.ts
@@ -890,17 +890,17 @@ You need to change your player to UMS mode for installation. </source>
     <name>CreateVoiceWindow</name>
     <message>
         <location filename="createvoicewindow.cpp" line="104"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation>Gewählte TTS engine : &lt;b&gt;%1&lt;/b&gt;</translation>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <translation>Gewählte TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="106"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählte TTS Engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="119"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählter Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
@@ -1262,17 +1262,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="124"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
-        <translation>Gewählte TTS engine : &lt;b&gt;%1&lt;/b&gt;</translation>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <translation>Gewählte TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="126"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählte TTS Engine: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="138"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Gewählter Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
diff --git a/rbutil/rbutilqt/rbutil_fr.ts b/rbutil/rbutilqt/rbutil_fr.ts
index fbcc81efa4..ca2c34e7ea 100644
--- a/rbutil/rbutilqt/rbutil_fr.ts
+++ b/rbutil/rbutilqt/rbutil_fr.ts
@@ -893,17 +893,17 @@ pour télécharger tous les fichiers néecessaires dans le cache.</translation>
     <name>CreateVoiceWindow</name>
     <message>
         <location filename="createvoicewindow.cpp" line="104"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="106"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="119"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Encodeur sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
@@ -1250,17 +1250,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="124"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="126"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Moteur TTS sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="138"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation>Encodeur sélectionné : &lt;b&gt;%1&lt;/b&gt;</translation>
     </message>
 </context>
diff --git a/rbutil/rbutilqt/rbutil_nl.ts b/rbutil/rbutilqt/rbutil_nl.ts
index bfe4a4350d..8df75cdae6 100644
--- a/rbutil/rbutilqt/rbutil_nl.ts
+++ b/rbutil/rbutilqt/rbutil_nl.ts
@@ -906,17 +906,17 @@ U moet uw speler in UMS modus plaatsen voor installatie.</translation>
     <name>CreateVoiceWindow</name>

     <message>

         <location filename="createvoicewindow.cpp" line="104"/>

-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

     <message>

         <location filename="createvoicewindow.cpp" line="106"/>

-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

     <message>

         <location filename="createvoicewindow.cpp" line="119"/>

-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

 </context>

@@ -1283,17 +1283,17 @@ p, li { white-space: pre-wrap; }
     </message>

     <message>

         <location filename="installtalkwindow.cpp" line="124"/>

-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

     <message>

         <location filename="installtalkwindow.cpp" line="126"/>

-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde TTS engine: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

     <message>

         <location filename="installtalkwindow.cpp" line="138"/>

-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>

+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>

         <translation>Geselecteerde Encoder: &lt;b&gt;%1&lt;/b&gt;</translation>

     </message>

 </context>

diff --git a/rbutil/rbutilqt/rbutil_tr.ts b/rbutil/rbutilqt/rbutil_tr.ts
index 8d0c3d8a88..4a45e0fd73 100644
--- a/rbutil/rbutilqt/rbutil_tr.ts
+++ b/rbutil/rbutilqt/rbutil_tr.ts
@@ -885,17 +885,17 @@ Aygitinizi ve baglama noktasini kendiniz se�iniz.</translation>
     <name>CreateVoiceWindow</name>
     <message>
         <location filename="createvoicewindow.cpp" line="104"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="106"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="createvoicewindow.cpp" line="119"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1242,17 +1242,17 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="124"/>
-        <source>Selected TTS engine : &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="126"/>
-        <source>Selected TTS Engine: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected TTS engine: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="installtalkwindow.cpp" line="138"/>
-        <source>Selected Encoder: &lt;b&gt;%1&lt;/b&gt;</source>
+        <source>Selected encoder: &lt;b&gt;%1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui
index 804856414f..071471ce3c 100644
--- a/rbutil/rbutilqt/rbutilqtfrm.ui
+++ b/rbutil/rbutilqt/rbutilqtfrm.ui
@@ -94,10 +94,7 @@
        <item row="0" column="1" >
         <widget class="QLabel" name="labelDevice" >
          <property name="text" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">&#xd;
-p, li { white-space: pre-wrap; }&#xd;
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">&#xd;
-&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-weight:600;">none&lt;/span> at &lt;span style=" font-weight:600;">unknown&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
+          <string>device / mountpoint unknown or invalid</string>
          </property>
         </widget>
        </item>