2 files changed, 4 insertions, 7 deletions

diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 5936b5d..64e0499 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -98,20 +98,20 @@ bool BatteryStatus::getProcApmStatusIpaq() {
   procApmIpaq.close();
 
   jackPercent = perc2.toInt();
   ipaqPercent = perc1.toInt();
 
   if (perc2.isEmpty()) {
-    perc2 = "no data";
+    perc2 = tr("no data");
   } else {
     perc2 += " %";
   }
 
 
   if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
-    sec2 = "no data";
+    sec2 = tr("no data");
   } else {
     sec2 += " min";
   }
 
   jackStatus == (" ( " + jackStatus + " )");
 
@@ -224,20 +224,20 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
   drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
   p.setPen( black);
 
 
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
 
-      p.drawText(15, 50, tr ("Ipaq  " + ipaqChem));
+      p.drawText(15, 50, tr ("Ipaq  ") + ipaqChem);
 
       QString jacketMsg;
       if (bat2) {
           p.setPen(black);
           p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
           p.drawText(10,240, tr("Battery time remaining: ") + sec2);
-          jacketMsg = tr("Jacket  " + jackChem);
+          jacketMsg = tr("Jacket  ") + jackChem;
       } else {
           jackPercent = 0;
           jacketMsg = tr("No jacket with battery inserted");
       }
 
       int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 83c148f..fe8ebfd 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -7,15 +7,12 @@
  **
  ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  **
  ************************************************************************************/
 // copyright 2002 Jeremy Cowgar <jc@cowgar.com>
-/*
- * $Id$
-*/
 // copyright 2002 and 2003  L.J.Potter <ljp@llornkcor.com>
 
 extern "C" {
 #include "adpcm.h"
 }