summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-06 09:56:49 (UTC)
committer mickeyl <mickeyl>2003-11-06 09:56:49 (UTC)
commit56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (patch) (side-by-side diff)
tree25d1ba2c7c3bdef72592b8d2de3e2a54f3294c2e
parent2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe (diff)
downloadopie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.zip
opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.gz
opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.bz2
merge core/applets/*
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp8
-rw-r--r--core/applets/vmemo/vmemo.cpp3
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
@@ -103,3 +103,3 @@ bool BatteryStatus::getProcApmStatusIpaq() {
if (perc2.isEmpty()) {
- perc2 = "no data";
+ perc2 = tr("no data");
} else {
@@ -110,3 +110,3 @@ bool BatteryStatus::getProcApmStatusIpaq() {
if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
- sec2 = "no data";
+ sec2 = tr("no data");
} else {
@@ -229,3 +229,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
- p.drawText(15, 50, tr ("Ipaq " + ipaqChem));
+ p.drawText(15, 50, tr ("Ipaq ") + ipaqChem);
@@ -236,3 +236,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
p.drawText(10,240, tr("Battery time remaining: ") + sec2);
- jacketMsg = tr("Jacket " + jackChem);
+ jacketMsg = tr("Jacket ") + jackChem;
} else {
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
@@ -12,5 +12,2 @@
// copyright 2002 Jeremy Cowgar <jc@cowgar.com>
-/*
- * $Id$
-*/
// copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com>