69 files changed, 71 insertions, 71 deletions
diff --git a/help/en/html/opie-advancedfm-help-en.control b/help/en/html/opie-advancedfm-help-en.control
index 47bb08a..bafec72 100644
--- a/help/en/html/opie-advancedfm-help-en.control
+++ b/help/en/html/opie-advancedfm-help-en.control
@@ -1,5 +1,5 @@
 Package: opie-advancedfm-help-en
-Files: help/en/html/advancedfm.html 
+Files: help/en/html/advancedfm.html
 Priority: optional
 Section: opie/onlinedoc
 Maintainer: ljp <llornkcor@handhelds.org>
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: opie-advancedfm
 License: GPL
 Description: Opie Advanced file manager help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-appearance-help-en.control b/help/en/html/opie-appearance-help-en.control
index 7cf47f2..ae02811 100644
--- a/help/en/html/opie-appearance-help-en.control
+++ b/help/en/html/opie-appearance-help-en.control
@@ -2,7 +2,7 @@ Package: opie-appearance-help-en
 Files: help/en/html/appearance.html help/en/html/appearance
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-appearance
 License: GPL
 Description: appearance help files (en)
diff --git a/help/en/html/opie-aqpkg-help-en.control b/help/en/html/opie-aqpkg-help-en.control
index a4c73df..190dcfb 100644
--- a/help/en/html/opie-aqpkg-help-en.control
+++ b/help/en/html/opie-aqpkg-help-en.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: opie-aqpkg
 License: GPL
 Description: AQPkg Opie package manager help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-backgammon-help-en.control b/help/en/html/opie-backgammon-help-en.control
index 50f7963..fa435e4 100644
--- a/help/en/html/opie-backgammon-help-en.control
+++ b/help/en/html/opie-backgammon-help-en.control
@@ -2,7 +2,7 @@ Package: opie-backgammon-help-en
 Files: help/en/html/backgammon.html help/en/html/backgammon
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-backgammon
 License: GPL
diff --git a/help/en/html/opie-backup-help-en.control b/help/en/html/opie-backup-help-en.control
index fb20668..d3ec55e 100644
--- a/help/en/html/opie-backup-help-en.control
+++ b/help/en/html/opie-backup-help-en.control
@@ -2,7 +2,7 @@ Package: opie-backup-help-en
 Files: help/en/html/backup.html help/en/html/backup
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-backup
 License: GPL
diff --git a/help/en/html/opie-bluetooth-manager-help-en.control b/help/en/html/opie-bluetooth-manager-help-en.control
index 425e8c3..a8c2afb 100644
--- a/help/en/html/opie-bluetooth-manager-help-en.control
+++ b/help/en/html/opie-bluetooth-manager-help-en.control
@@ -2,7 +2,7 @@ Package: opie-bluetooth-manager-help-en
 Files: help/en/html/bluetooth-manager.html help/en/html/bluetooth-manager
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-bluetooth-manager
 License: GPL
diff --git a/help/en/html/opie-bounce-help-en.control b/help/en/html/opie-bounce-help-en.control
index b0a381e..47fa605 100644
--- a/help/en/html/opie-bounce-help-en.control
+++ b/help/en/html/opie-bounce-help-en.control
@@ -2,7 +2,7 @@ Package: opie-bounce-help-en
 Files: help/en/html/bounce.html help/en/html/bounce
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-bounce
 License: GPL
 Description: bounce help files (en)
diff --git a/help/en/html/opie-buttonsettings-help-en.control b/help/en/html/opie-buttonsettings-help-en.control
index 0d57177..2e2e475 100644
--- a/help/en/html/opie-buttonsettings-help-en.control
+++ b/help/en/html/opie-buttonsettings-help-en.control
@@ -2,7 +2,7 @@ Package: opie-buttonsettings-help-en
 Files: help/en/html/buttonsettings.html help/en/html/buttonsettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buttonsettings
 License: GPL
 Description: buttonsettings help files (en)
diff --git a/help/en/html/opie-buzzword-help-en.control b/help/en/html/opie-buzzword-help-en.control
index 0fa6474..67f7fb1 100644
--- a/help/en/html/opie-buzzword-help-en.control
+++ b/help/en/html/opie-buzzword-help-en.control
@@ -2,7 +2,7 @@ Package: opie-buzzword-help-en
 Files: help/en/html/buzzword.html help/en/html/buzzword
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-buzzword
 License: GPL
 Description: buzzword help files (en)
diff --git a/help/en/html/opie-calculator-help-en.control b/help/en/html/opie-calculator-help-en.control
index 7076632..1b05f3c 100644
--- a/help/en/html/opie-calculator-help-en.control
+++ b/help/en/html/opie-calculator-help-en.control
@@ -2,7 +2,7 @@ Package: opie-calculator-help-en
 Files: help/en/html/calculator.html help/en/html/calculator
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calculator
 License: GPL
 Description: calculator help files (en)
diff --git a/help/en/html/opie-calibrate-help-en.control b/help/en/html/opie-calibrate-help-en.control
index 169cc93..9741bce 100644
--- a/help/en/html/opie-calibrate-help-en.control
+++ b/help/en/html/opie-calibrate-help-en.control
@@ -2,7 +2,7 @@ Package: opie-calibrate-help-en
 Files: help/en/html/calibrate.html help/en/html/calibrate
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-calibrate
 License: GPL
 Description: calibrate help files (en)
diff --git a/help/en/html/opie-checkbook-help-en.control b/help/en/html/opie-checkbook-help-en.control
index 66d19f3..fed7c61 100644
--- a/help/en/html/opie-checkbook-help-en.control
+++ b/help/en/html/opie-checkbook-help-en.control
@@ -2,7 +2,7 @@ Package: opie-checkbook-help-en
 Files: help/en/html/checkbook.html help/en/html/checkbook
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-checkbook
 License: GPL
 Description: checkbook help files (en)
diff --git a/help/en/html/opie-citytime-help-en.control b/help/en/html/opie-citytime-help-en.control
index b27c58b..a2f66c4 100644
--- a/help/en/html/opie-citytime-help-en.control
+++ b/help/en/html/opie-citytime-help-en.control
@@ -2,7 +2,7 @@ Package: opie-citytime-help-en
 Files: help/en/html/citytime.html help/en/html/citytime
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-citytime
 License: GPL
 Description: citytime help files (en)
diff --git a/help/en/html/opie-clock-help-en.control b/help/en/html/opie-clock-help-en.control
index f452350..7a9a648 100644
--- a/help/en/html/opie-clock-help-en.control
+++ b/help/en/html/opie-clock-help-en.control
@@ -2,7 +2,7 @@ Package: opie-clock-help-en
 Files: help/en/html/clock.html help/en/html/clock
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-clock
 License: GPL
 Description: clock help files (en)
diff --git a/help/en/html/opie-confedit-help-en.control b/help/en/html/opie-confedit-help-en.control
index a1bd441..04d20fc 100644
--- a/help/en/html/opie-confedit-help-en.control
+++ b/help/en/html/opie-confedit-help-en.control
@@ -2,7 +2,7 @@ Package: opie-confedit-help-en
 Files: help/en/html/confedit.html help/en/html/confedit
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-confedit
 License: GPL
 Description: confedit help files (en)
diff --git a/help/en/html/opie-console-help-en.control b/help/en/html/opie-console-help-en.control
index d6ecf47..7004ce5 100644
--- a/help/en/html/opie-console-help-en.control
+++ b/help/en/html/opie-console-help-en.control
@@ -2,10 +2,10 @@ Package: opie-console-help-en
 Files: help/en/html/opie-console.html help/en/html/opie-console/*
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Opie team <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: opie-console
 License: GPL
 Description: Opie terminal app help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-embeddedkonsole-help-en.control b/help/en/html/opie-embeddedkonsole-help-en.control
index 4c6892a..5da9e57 100644
--- a/help/en/html/opie-embeddedkonsole-help-en.control
+++ b/help/en/html/opie-embeddedkonsole-help-en.control
@@ -2,7 +2,7 @@ Package: opie-embeddedkonsole-help-en
 Files: help/en/html/embeddedkonsole.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-embeddedkonsole
 License: GPL
 Description: embeddedkonsole help files (en)
diff --git a/help/en/html/opie-euroconv-help-en.control b/help/en/html/opie-euroconv-help-en.control
index f83660c..876d617 100644
--- a/help/en/html/opie-euroconv-help-en.control
+++ b/help/en/html/opie-euroconv-help-en.control
@@ -2,7 +2,7 @@ Package: opie-euroconv-help-en
 Files: help/en/html/euroconv.html help/en/html/euroconv
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-euroconv
 License: GPL
 Description: euroconv help files (en)
diff --git a/help/en/html/opie-fifteen-help-en.control b/help/en/html/opie-fifteen-help-en.control
index f431487..1e1d8e4 100644
--- a/help/en/html/opie-fifteen-help-en.control
+++ b/help/en/html/opie-fifteen-help-en.control
@@ -2,7 +2,7 @@ Package: opie-fifteen-help-en
 Files: help/en/html/fifteen.html help/en/html/fifteen
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-fifteen
 License: GPL
 Description: fifteen help files (en)
diff --git a/help/en/html/opie-formatter-help-en.control b/help/en/html/opie-formatter-help-en.control
index 3d7cb15..2a298cb 100644
--- a/help/en/html/opie-formatter-help-en.control
+++ b/help/en/html/opie-formatter-help-en.control
@@ -2,7 +2,7 @@ Package: opie-formatter-help-en
 Files: help/en/html/formatter.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-formatter
 License: GPL
 Description: formatter help files (en)
diff --git a/help/en/html/opie-go-help-en.control b/help/en/html/opie-go-help-en.control
index 824f762..5e40369 100644
--- a/help/en/html/opie-go-help-en.control
+++ b/help/en/html/opie-go-help-en.control
@@ -2,7 +2,7 @@ Package: opie-go-help-en
 Files: help/en/html/go.html help/en/html/go
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-go
 License: GPL
 Description: go help files (en)
diff --git a/help/en/html/opie-gsmtool-help-en.control b/help/en/html/opie-gsmtool-help-en.control
index 224cf13..9671ab3 100644
--- a/help/en/html/opie-gsmtool-help-en.control
+++ b/help/en/html/opie-gsmtool-help-en.control
@@ -2,7 +2,7 @@ Package: opie-gsmtool-help-en
 Files: help/en/html/gsmtool.html help/en/html/gsmtool
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-gsmtool
 License: GPL
 Description: gsmtool help files (en)
diff --git a/help/en/html/opie-irc-help-en.control b/help/en/html/opie-irc-help-en.control
index 1fe3850..8b980c4 100644
--- a/help/en/html/opie-irc-help-en.control
+++ b/help/en/html/opie-irc-help-en.control
@@ -2,7 +2,7 @@ Package: opie-irc-help-en
 Files: help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-irc
 License: GPL
 Description: opieirc help files (en)
diff --git a/help/en/html/opie-kbill-help-en.control b/help/en/html/opie-kbill-help-en.control
index 39e5214..f53636e 100644
--- a/help/en/html/opie-kbill-help-en.control
+++ b/help/en/html/opie-kbill-help-en.control
@@ -2,7 +2,7 @@ Package: opie-kbill-help-en
 Files: help/en/html/kbill.html help/en/html/kbill
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kbill
 License: GPL
 Description: kbill help files (en)
diff --git a/help/en/html/opie-kcheckers-help-en.control b/help/en/html/opie-kcheckers-help-en.control
index 3684de8..9b3a373 100644
--- a/help/en/html/opie-kcheckers-help-en.control
+++ b/help/en/html/opie-kcheckers-help-en.control
@@ -2,7 +2,7 @@ Package: opie-kcheckers-help-en
 Files: help/en/html/kcheckers.html help/en/html/kcheckers
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kcheckers
 License: GPL
 Description: kcheckers help files (en)
diff --git a/help/en/html/opie-keypebble-help-en.control b/help/en/html/opie-keypebble-help-en.control
index c067c67..0d2f4b7 100644
--- a/help/en/html/opie-keypebble-help-en.control
+++ b/help/en/html/opie-keypebble-help-en.control
@@ -2,7 +2,7 @@ Package: opie-keypebble-help-en
 Files: help/en/html/keypebble.html help/en/html/keypebble
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-keypebble
 License: GPL
 Description: keypebble help files (en)
diff --git a/help/en/html/opie-kpacman-help-en.control b/help/en/html/opie-kpacman-help-en.control
index d572fe1..51220ce 100644
--- a/help/en/html/opie-kpacman-help-en.control
+++ b/help/en/html/opie-kpacman-help-en.control
@@ -2,7 +2,7 @@ Package: opie-kpacman-help-en
 Files: help/en/html/kpacman.html help/en/html/kpacman
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-kpacman
 License: GPL
 Description: kpacman help files (en)
diff --git a/help/en/html/opie-language-help-en.control b/help/en/html/opie-language-help-en.control
index 616c636..fd92e86 100644
--- a/help/en/html/opie-language-help-en.control
+++ b/help/en/html/opie-language-help-en.control
@@ -2,7 +2,7 @@ Package: opie-language-help-en
 Files: help/en/html/language.html help/en/html/language
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-language
 License: GPL
 Description: language help files (en)
diff --git a/help/en/html/opie-launchersettings-help-en.control b/help/en/html/opie-launchersettings-help-en.control
index 3bc8ead..9696845 100644
--- a/help/en/html/opie-launchersettings-help-en.control
+++ b/help/en/html/opie-launchersettings-help-en.control
@@ -2,7 +2,7 @@ Package: opie-launchersettings-help-en
 Files: help/en/html/launchersettings.html help/en/html/launchersettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-launchersettings
 License: GPL
 Description: launchersettings help files (en)
diff --git a/help/en/html/opie-light-and-power-help-en.control b/help/en/html/opie-light-and-power-help-en.control
index b563f60..765eb94 100644
--- a/help/en/html/opie-light-and-power-help-en.control
+++ b/help/en/html/opie-light-and-power-help-en.control
@@ -2,7 +2,7 @@ Package: opie-light-and-power-help-en
 Files: help/en/html/light-and-power.html help/en/html/light-and-power
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-light-and-power
 License: GPL
 Description: light-and-power help files (en)
diff --git a/help/en/html/opie-mediummount-help-en.control b/help/en/html/opie-mediummount-help-en.control
index 22261ce..ea39b1c 100644
--- a/help/en/html/opie-mediummount-help-en.control
+++ b/help/en/html/opie-mediummount-help-en.control
@@ -2,7 +2,7 @@ Package: opie-mediummount-help-en
 Files: help/en/html/mediummount.html help/en/html/mediummount
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mediummount
 License: GPL
 Description: mediummount help files (en)
diff --git a/help/en/html/opie-mindbreaker-help-en.control b/help/en/html/opie-mindbreaker-help-en.control
index 828dde7..cc5fb25 100644
--- a/help/en/html/opie-mindbreaker-help-en.control
+++ b/help/en/html/opie-mindbreaker-help-en.control
@@ -2,7 +2,7 @@ Package: opie-mindbreaker-help-en
 Files: help/en/html/mindbreaker.html help/en/html/mindbreaker
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mindbreaker
 License: GPL
 Description: mindbreaker help files (en)
diff --git a/help/en/html/opie-minesweep-help-en.control b/help/en/html/opie-minesweep-help-en.control
index e81ba2d..95f9fdf 100644
--- a/help/en/html/opie-minesweep-help-en.control
+++ b/help/en/html/opie-minesweep-help-en.control
@@ -2,7 +2,7 @@ Package: opie-minesweep-help-en
 Files: help/en/html/minesweep.html help/en/html/minesweep
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-minesweep
 License: GPL
 Description: minesweep help files (en)
diff --git a/help/en/html/opie-mobilemsg-help-en.control b/help/en/html/opie-mobilemsg-help-en.control
index a976e6d..0e18231 100644
--- a/help/en/html/opie-mobilemsg-help-en.control
+++ b/help/en/html/opie-mobilemsg-help-en.control
@@ -2,7 +2,7 @@ Package: opie-mobilemsg-help-en
 Files: help/en/html/mobilemsg.html help/en/html/mobilemsg
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-mobilemsg
 License: GPL
 Description: mobilemsg help files (en)
diff --git a/help/en/html/opie-networksettings-help-en.control b/help/en/html/opie-networksettings-help-en.control
index 2cf7ca9..7b0eb8e 100644
--- a/help/en/html/opie-networksettings-help-en.control
+++ b/help/en/html/opie-networksettings-help-en.control
@@ -2,7 +2,7 @@ Package: opie-networksettings-help-en
 Files: help/en/html/networksettings.html help/en/html/networksettings
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-networksettings
 License: GPL
 Description: networksettings help files (en)
diff --git a/help/en/html/opie-odict-help-en.control b/help/en/html/opie-odict-help-en.control
index 43ec937..1972b2f 100644
--- a/help/en/html/opie-odict-help-en.control
+++ b/help/en/html/opie-odict-help-en.control
@@ -2,7 +2,7 @@ Package: opie-odict-help-en
 Files: help/en/html/odict.html help/en/html/odict
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-odict
 License: GPL
 Description: odict help files (en)
diff --git a/help/en/html/opie-opie-write-help-en.control b/help/en/html/opie-opie-write-help-en.control
index cf1fe49..ad6ed9e 100644
--- a/help/en/html/opie-opie-write-help-en.control
+++ b/help/en/html/opie-opie-write-help-en.control
@@ -2,7 +2,7 @@ Package: opie-opie-write-help-en
 Files: help/en/html/opie-write.html help/en/html/opie-write
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opie-write
 License: GPL
 Description: opie-write help files (en)
diff --git a/help/en/html/opie-opieftp-help-en.control b/help/en/html/opie-opieftp-help-en.control
index d7da397..157a6d9 100644
--- a/help/en/html/opie-opieftp-help-en.control
+++ b/help/en/html/opie-opieftp-help-en.control
@@ -2,7 +2,7 @@ Package: opie-opieftp-help-en
 Files: help/en/html/opieftp.html help/en/html/opieftp
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieftp
 License: GPL
 Description: opieftp help files (en)
diff --git a/help/en/html/opie-opieirc-help-en.control b/help/en/html/opie-opieirc-help-en.control
index a5027e0..706f143 100644
--- a/help/en/html/opie-opieirc-help-en.control
+++ b/help/en/html/opie-opieirc-help-en.control
@@ -2,7 +2,7 @@ Package: opie-opieirc-help-en
 Files: help/en/html/opieirc.html help/en/html/opieirc
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieirc
 License: GPL
 Description: opieirc help files (en)
diff --git a/help/en/html/opie-opieplayer-help-en.control b/help/en/html/opie-opieplayer-help-en.control
index d3ac2fd..a45abac 100644
--- a/help/en/html/opie-opieplayer-help-en.control
+++ b/help/en/html/opie-opieplayer-help-en.control
@@ -2,7 +2,7 @@ Package: opie-opieplayer-help-en
 Files: help/en/html/opieplayer.html help/en/html/opieplayer
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opieplayer
 License: GPL
 Description: opieplayer help files (en)
diff --git a/help/en/html/opie-opierec-help-en.control b/help/en/html/opie-opierec-help-en.control
index bc17507..778de2d 100644
--- a/help/en/html/opie-opierec-help-en.control
+++ b/help/en/html/opie-opierec-help-en.control
@@ -2,7 +2,7 @@ Package: opie-opierec-help-en
 Files: help/en/html/opierec.html
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-opierec
 License: GPL
 Description: opierec help files (en)
diff --git a/help/en/html/opie-oxygen-help-en.control b/help/en/html/opie-oxygen-help-en.control
index 8ee0c52..f6cb618 100644
--- a/help/en/html/opie-oxygen-help-en.control
+++ b/help/en/html/opie-oxygen-help-en.control
@@ -2,7 +2,7 @@ Package: opie-oxygen-help-en
 Files: help/en/html/oxygen.html help/en/html/oxygen
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-oxygen
 License: GPL
 Description: oxygen help files (en)
diff --git a/help/en/html/opie-parashoot-help-en.control b/help/en/html/opie-parashoot-help-en.control
index 56e2ed2..9d0cfd6 100644
--- a/help/en/html/opie-parashoot-help-en.control
+++ b/help/en/html/opie-parashoot-help-en.control
@@ -2,7 +2,7 @@ Package: opie-parashoot-help-en
 Files: help/en/html/parashoot.html help/en/html/parashoot
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-parashoot
 License: GPL
 Description: parashoot help files (en)
diff --git a/help/en/html/opie-patience-help-en.control b/help/en/html/opie-patience-help-en.control
index b81862d..0214e4a 100644
--- a/help/en/html/opie-patience-help-en.control
+++ b/help/en/html/opie-patience-help-en.control
@@ -2,7 +2,7 @@ Package: opie-patience-help-en
 Files: help/en/html/patience.html help/en/html/patience
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-patience
 License: GPL
 Description: patience help files (en)
diff --git a/help/en/html/opie-qasteroids-help-en.control b/help/en/html/opie-qasteroids-help-en.control
index ba81572..52fe011 100644
--- a/help/en/html/opie-qasteroids-help-en.control
+++ b/help/en/html/opie-qasteroids-help-en.control
@@ -2,7 +2,7 @@ Package: opie-qasteroids-help-en
 Files: help/en/html/qasteroids.html help/en/html/qasteroids
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qasteroids
 License: GPL
 Description: qasteroids help files (en)
diff --git a/help/en/html/opie-qpdf-help-en.control b/help/en/html/opie-qpdf-help-en.control
index a87b8bb..77b624a 100644
--- a/help/en/html/opie-qpdf-help-en.control
+++ b/help/en/html/opie-qpdf-help-en.control
@@ -2,7 +2,7 @@ Package: opie-qpdf-help-en
 Files: help/en/html/qpdf.html help/en/html/qpdf
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-qpdf
 License: GPL
 Description: qpdf help files (en)
diff --git a/help/en/html/opie-reader-help-en.control b/help/en/html/opie-reader-help-en.control
index 2a4194e..b72da02 100644
--- a/help/en/html/opie-reader-help-en.control
+++ b/help/en/html/opie-reader-help-en.control
@@ -2,7 +2,7 @@ Package: opie-reader-help-en
 Files: help/en/html/reader.html help/en/html/reader
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-reader
 License: GPL
 Description: reader help files (en)
diff --git a/help/en/html/opie-remote-help-en.control b/help/en/html/opie-remote-help-en.control
index 94f03a8..17127de 100644
--- a/help/en/html/opie-remote-help-en.control
+++ b/help/en/html/opie-remote-help-en.control
@@ -2,7 +2,7 @@ Package: opie-remote-help-en
 Files: help/en/html/remote.html help/en/html/remote
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-remote
 License: GPL
 Description: remote help files (en)
diff --git a/help/en/html/opie-rotation-help-en.control b/help/en/html/opie-rotation-help-en.control
index b5593b1..79c4135 100644
--- a/help/en/html/opie-rotation-help-en.control
+++ b/help/en/html/opie-rotation-help-en.control
@@ -2,7 +2,7 @@ Package: opie-rotation-help-en
 Files: help/en/html/rotation.html help/en/html/rotation
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-rotation
 License: GPL
 Description: rotation help files (en)
diff --git a/help/en/html/opie-security-help-en.control b/help/en/html/opie-security-help-en.control
index 3aef0e0..1fad1d0 100644
--- a/help/en/html/opie-security-help-en.control
+++ b/help/en/html/opie-security-help-en.control
@@ -2,7 +2,7 @@ Package: opie-security-help-en
 Files: help/en/html/security.html help/en/html/security
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-security
 License: GPL
 Description: security help files (en)
diff --git a/help/en/html/opie-sfcave-help-en.control b/help/en/html/opie-sfcave-help-en.control
index b8f1ab6..4b75586 100644
--- a/help/en/html/opie-sfcave-help-en.control
+++ b/help/en/html/opie-sfcave-help-en.control
@@ -2,7 +2,7 @@ Package: opie-sfcave-help-en
 Files: help/en/html/sfcave.html help/en/html/sfcave
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sfcave
 License: GPL
 Description: sfcave help files (en)
diff --git a/help/en/html/opie-sheetqt-help-en.control b/help/en/html/opie-sheetqt-help-en.control
index de47fe5..2465180 100644
--- a/help/en/html/opie-sheetqt-help-en.control
+++ b/help/en/html/opie-sheetqt-help-en.control
@@ -2,7 +2,7 @@ Package: opie-sheetqt-help-en
 Files: help/en/html/sheetqt.html help/en/html/sheetqt
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sheetqt
 License: GPL
 Description: sheetqt help files (en)
diff --git a/help/en/html/opie-showimg-help-en.control b/help/en/html/opie-showimg-help-en.control
index e4fced5..c8245b6 100644
--- a/help/en/html/opie-showimg-help-en.control
+++ b/help/en/html/opie-showimg-help-en.control
@@ -2,7 +2,7 @@ Package: opie-showimg-help-en
 Files: help/en/html/showimg.html help/en/html/showimg
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-showimg
 License: GPL
 Description: showimg help files (en)
diff --git a/help/en/html/opie-shutdown-help-en.control b/help/en/html/opie-shutdown-help-en.control
index cf4b153..2a290f4 100644
--- a/help/en/html/opie-shutdown-help-en.control
+++ b/help/en/html/opie-shutdown-help-en.control
@@ -2,7 +2,7 @@ Package: opie-shutdown-help-en
 Files: help/en/html/shutdown.html help/en/html/shutdown
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-shutdown
 License: GPL
 Description: shutdown help files (en)
diff --git a/help/en/html/opie-snake-help-en.control b/help/en/html/opie-snake-help-en.control
index 4b82cf9..74c42e9 100644
--- a/help/en/html/opie-snake-help-en.control
+++ b/help/en/html/opie-snake-help-en.control
@@ -2,7 +2,7 @@ Package: opie-snake-help-en
 Files: help/en/html/snake.html help/en/html/snake
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-snake
 License: GPL
 Description: snake help files (en)
diff --git a/help/en/html/opie-sound-help-en.control b/help/en/html/opie-sound-help-en.control
index cb34934..f870a37 100644
--- a/help/en/html/opie-sound-help-en.control
+++ b/help/en/html/opie-sound-help-en.control
@@ -2,7 +2,7 @@ Package: opie-sound-help-en
 Files: help/en/html/sound.html help/en/html/sound
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sound
 License: GPL
 Description: sound help files (en)
diff --git a/help/en/html/opie-sshkeys-help-en.control b/help/en/html/opie-sshkeys-help-en.control
index f3528c2..43b8f0c 100644
--- a/help/en/html/opie-sshkeys-help-en.control
+++ b/help/en/html/opie-sshkeys-help-en.control
@@ -2,7 +2,7 @@ Package: opie-sshkeys-help-en
 Files: help/en/html/sshkeys.html help/en/html/sshkeys
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sshkeys
 License: GPL
 Description: sshkeys help files (en)
diff --git a/help/en/html/opie-sysinfo-help-en.control b/help/en/html/opie-sysinfo-help-en.control
index 21ccd27..d901990 100644
--- a/help/en/html/opie-sysinfo-help-en.control
+++ b/help/en/html/opie-sysinfo-help-en.control
@@ -2,7 +2,7 @@ Package: opie-sysinfo-help-en
 Files: help/en/html/sysinfo.html help/en/html/sysinfo
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-sysinfo
 License: GPL
 Description: sysinfo help files (en)
diff --git a/help/en/html/opie-systemtime-help-en.control b/help/en/html/opie-systemtime-help-en.control
index 6b16f46..ab02a4f 100644
--- a/help/en/html/opie-systemtime-help-en.control
+++ b/help/en/html/opie-systemtime-help-en.control
@@ -2,7 +2,7 @@ Package: opie-systemtime-help-en
 Files: help/en/html/systemtime.html help/en/html/systemtime
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-systemtime
 License: GPL
 Description: systemtime help files (en)
diff --git a/help/en/html/opie-tableviewer-help-en.control b/help/en/html/opie-tableviewer-help-en.control
index 3394367..aa6f959 100644
--- a/help/en/html/opie-tableviewer-help-en.control
+++ b/help/en/html/opie-tableviewer-help-en.control
@@ -2,7 +2,7 @@ Package: opie-tableviewer-help-en
 Files: help/en/html/tableviewer.html help/en/html/tableviewer
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tableviewer
 License: GPL
 Description: tableviewer help files (en)
diff --git a/help/en/html/opie-tetrix-help-en.control b/help/en/html/opie-tetrix-help-en.control
index c5a09f9..c006a4b 100644
--- a/help/en/html/opie-tetrix-help-en.control
+++ b/help/en/html/opie-tetrix-help-en.control
@@ -2,7 +2,7 @@ Package: opie-tetrix-help-en
 Files: help/en/html/tetrix.html help/en/html/tetrix
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tetrix
 License: GPL
 Description: tetrix help files (en)
diff --git a/help/en/html/opie-tictac-help-en.control b/help/en/html/opie-tictac-help-en.control
index 5336b2a..e0b715e 100644
--- a/help/en/html/opie-tictac-help-en.control
+++ b/help/en/html/opie-tictac-help-en.control
@@ -2,7 +2,7 @@ Package: opie-tictac-help-en
 Files: help/en/html/tictac.html help/en/html/tictac
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tictac
 License: GPL
 Description: tictac help files (en)
diff --git a/help/en/html/opie-tinykate-help-en.control b/help/en/html/opie-tinykate-help-en.control
index 602bfd2..fe228f0 100644
--- a/help/en/html/opie-tinykate-help-en.control
+++ b/help/en/html/opie-tinykate-help-en.control
@@ -2,7 +2,7 @@ Package: opie-tinykate-help-en
 Files: help/en/html/tinykate.html help/en/html/tinykate
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-tinykate
 License: GPL
 Description: tinykate help files (en)
diff --git a/help/en/html/opie-ubrowser-help-en.control b/help/en/html/opie-ubrowser-help-en.control
index 98b3b7a..0798b44 100644
--- a/help/en/html/opie-ubrowser-help-en.control
+++ b/help/en/html/opie-ubrowser-help-en.control
@@ -2,7 +2,7 @@ Package: opie-ubrowser-help-en
 Files: help/en/html/ubrowser.html help/en/html/ubrowser
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-ubrowser
 License: GPL
 Description: ubrowser help files (en)
diff --git a/help/en/html/opie-usermanager-help-en.control b/help/en/html/opie-usermanager-help-en.control
index 9642da1..fd16672 100644
--- a/help/en/html/opie-usermanager-help-en.control
+++ b/help/en/html/opie-usermanager-help-en.control
@@ -2,7 +2,7 @@ Package: opie-usermanager-help-en
 Files: help/en/html/usermanager.html help/en/html/usermanager
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-usermanager
 License: GPL
 Description: usermanager help files (en)
diff --git a/help/en/html/opie-vmemo-help-en.control b/help/en/html/opie-vmemo-help-en.control
index c81f29a..c379f8c 100644
--- a/help/en/html/opie-vmemo-help-en.control
+++ b/help/en/html/opie-vmemo-help-en.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: opie-vmemo
 License: GPL
 Description: Opie Vmemo voice recording help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wellenreiter-help-en.control b/help/en/html/opie-wellenreiter-help-en.control
index 33aa974..b93f097 100644
--- a/help/en/html/opie-wellenreiter-help-en.control
+++ b/help/en/html/opie-wellenreiter-help-en.control
@@ -7,5 +7,5 @@ Architecture: arm
 Depends: opie-wellenreiter
 License: GPL
 Description: Opie Wellenreiter help files (english)
- 
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/help/en/html/opie-wlansetup-help-en.control b/help/en/html/opie-wlansetup-help-en.control
index 7f555f7..4cabb21 100644
--- a/help/en/html/opie-wlansetup-help-en.control
+++ b/help/en/html/opie-wlansetup-help-en.control
@@ -2,7 +2,7 @@ Package: opie-wlansetup-help-en
 Files: help/en/html/wlansetup.html help/en/html/wlansetup
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wlansetup
 License: GPL
 Description: wlansetup help files (en)
diff --git a/help/en/html/opie-wordgame-help-en.control b/help/en/html/opie-wordgame-help-en.control
index f9961fc..79e6ffe 100644
--- a/help/en/html/opie-wordgame-help-en.control
+++ b/help/en/html/opie-wordgame-help-en.control
@@ -2,7 +2,7 @@ Package: opie-wordgame-help-en
 Files: help/en/html/wordgame.html help/en/html/wordgame
 Priority: optional
 Section: opie/onlinedoc
-Maintainer: Team Opie <opie@handhelds.org>
+Maintainer: Opie Team <opie@handhelds.org>
 Depends: opie-wordgame
 License: GPL
 Description: wordgame help files (en)