| author | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
| commit | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (patch) (side-by-side diff) | |
| tree | 25d1ba2c7c3bdef72592b8d2de3e2a54f3294c2e /core | |
| parent | 2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe (diff) | |
| download | opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.zip opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.gz opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.bz2 | |
merge core/applets/*
| -rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 8 | ||||
| -rw-r--r-- | core/applets/vmemo/vmemo.cpp | 3 |
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 @@ -101,14 +101,14 @@ bool BatteryStatus::getProcApmStatusIpaq() { 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"; } @@ -227,14 +227,14 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { 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"); 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 @@ -10,9 +10,6 @@ ** ************************************************************************************/ // copyright 2002 Jeremy Cowgar <jc@cowgar.com> -/* - * $Id$ -*/ // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> extern "C" { |