author | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
commit | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (patch) (unidiff) | |
tree | 25d1ba2c7c3bdef72592b8d2de3e2a54f3294c2e | |
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 | |||
@@ -103,3 +103,3 @@ bool BatteryStatus::getProcApmStatusIpaq() { | |||
103 | if (perc2.isEmpty()) { | 103 | if (perc2.isEmpty()) { |
104 | perc2 = "no data"; | 104 | perc2 = tr("no data"); |
105 | } else { | 105 | } else { |
@@ -110,3 +110,3 @@ bool BatteryStatus::getProcApmStatusIpaq() { | |||
110 | if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { | 110 | if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { |
111 | sec2 = "no data"; | 111 | sec2 = tr("no data"); |
112 | } else { | 112 | } else { |
@@ -229,3 +229,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
229 | 229 | ||
230 | p.drawText(15, 50, tr ("Ipaq " + ipaqChem)); | 230 | p.drawText(15, 50, tr ("Ipaq ") + ipaqChem); |
231 | 231 | ||
@@ -236,3 +236,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
236 | p.drawText(10,240, tr("Battery time remaining: ") + sec2); | 236 | p.drawText(10,240, tr("Battery time remaining: ") + sec2); |
237 | jacketMsg = tr("Jacket " + jackChem); | 237 | jacketMsg = tr("Jacket ") + jackChem; |
238 | } else { | 238 | } 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 @@ | |||
12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> | 12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> |
13 | /* | ||
14 | * $Id$ | ||
15 | */ | ||
16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> | 13 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> |