Merge from BRANCH_1_0

3 files changed, 7 insertions, 5 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index 41c99a8..ecbf12f 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -435,3 +435,4 @@ void Clock::alarmOn()
                          "alarm(QDateTime,int)", warn );
-  setCaption( "Alarm set: " + whenl.toString() );
+//  setCaption( "Alarm set: " + whenl.toString() );
+  setCaption( tr("Alarm set: %1" ).arg(whenl.toString()) );
 }
@@ -446,3 +447,3 @@ void Clock::alarmOff()
   qDebug( "Alarm Off " + when.toString() );
-  setCaption( "Clock" );
+  setCaption( tr("Clock") );
 }
@@ -454,3 +455,3 @@ void Clock::clearTimer()
   snoozeBtn->hide();
-  setCaption( "Clock" );
+  setCaption( tr("Clock") );
 }
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp
index 2d97f4e..7d69535 100644
--- a/noncore/tools/euroconv/main.cpp
+++ b/noncore/tools/euroconv/main.cpp
@@ -33,3 +33,3 @@ int main( int argc, char **argv ) {
     app.setMainWidget(layout);
-    layout->setCaption("Euroconv");
+    layout->setCaption( QObject::tr("Euroconv") );
     layout->showMaximized ();
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 21de4d2..49f6355 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -402,3 +402,4 @@ void FormatterApp::deviceComboSelected(int index) {
 
-    TextLabel5->setText(tr("Type: %1\nFormatted with %1\n%1, %1, %1").arg( nameS).arg( fsType).arg(totalS).arg( usedS).arg( avS )); 
+    TextLabel5->setText(tr("Type: %1\nFormatted with %2\n%3, %4, %5").arg( nameS).arg( fsType).arg(totalS).arg( usedS).arg( avS )); 
+    TextLabel5->setTextFormat( Qt::RichText );
 //     storageComboSelected(0);