* Update english translation

* Send proper mime header if file not modified (on state 304)

11 files changed, 188 insertions, 202 deletions

diff --git a/lib/XXV/OUTPUT/Ajax.pm b/lib/XXV/OUTPUT/Ajax.pm
index a3e96dc..772ca54 100644
--- a/lib/XXV/OUTPUT/Ajax.pm
+++ b/lib/XXV/OUTPUT/Ajax.pm
@@ -13,7 +13,7 @@ $SIG{CHLD} = 'IGNORE';
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'Ajax',
         Prereq => {
@@ -32,7 +32,7 @@ sub module {
 # ------------------
 sub AUTOLOAD {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || {};
     my $params = shift || 0;
 
@@ -99,7 +99,7 @@ sub new {
 # ------------------
 sub out {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || 0;
     my $para = shift || 0;
     my $name = shift || 'noName';
@@ -127,7 +127,7 @@ sub out {
 # ------------------
 sub printout {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $nopack = shift || $obj->{nopack} || 0;
 
 
@@ -153,7 +153,7 @@ sub printout {
 # ------------------
 sub header {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $typ = shift || return error ('No Type!' );
     my $arg = shift || {};
 
@@ -175,7 +175,7 @@ sub header {
 # ------------------
 sub headerNoAuth {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $typ = shift || 'text/html';
 
     $obj->{header} = 401;
@@ -188,7 +188,7 @@ sub headerNoAuth {
 # ------------------
 sub msg {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || 0;
     my $err  = shift || 0;
 
@@ -208,14 +208,14 @@ sub msg {
 # ------------------
 sub typ {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{TYP};
 }
 
 # ------------------
 sub setCall {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $name = shift || return error ('No Name!' );
 
     $obj->{call} = $name;
@@ -225,7 +225,7 @@ sub setCall {
 # ------------------
 sub browser {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{browser};
 }
 
diff --git a/lib/XXV/OUTPUT/Console.pm b/lib/XXV/OUTPUT/Console.pm
index 0f59cc5..7d46545 100644
--- a/lib/XXV/OUTPUT/Console.pm
+++ b/lib/XXV/OUTPUT/Console.pm
@@ -17,7 +17,7 @@ use vars qw($AUTOLOAD);
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'Telnet',
         Prereq => {
@@ -25,7 +25,7 @@ sub module {
             'Text::ASCIITable' => 'Create a nice formatted table using ASCII characters.',
             'Term::ReadLine::Perl' => 'a quick implementation of the minimal interface to Readline',
         },
-        Description => gettext('This receive and send ASCII messages'),
+        Description => gettext('This receives and sends ASCII messages'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -37,14 +37,14 @@ sub module {
 # ------------------
 sub AUTOLOAD {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || {};
     my $params = shift || 0;
 
     my $name = (split('::', $AUTOLOAD))[-1];
     return  if($name eq 'DESTROY');
 
-    $obj->message(gettext("Sorry, but this command is not available in this Interface!"));
+    $obj->message(gettext("Sorry, but this command is not available in this interface!"));
 }
 
 # ------------------
@@ -93,7 +93,7 @@ sub new {
 # ------------------
 sub printout {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     $data =~ s/[^\r]\n/\r\n/sig;
@@ -105,7 +105,7 @@ sub printout {
 # ------------------
 sub message {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     my $t = Text::ASCIITable->new();
@@ -123,7 +123,7 @@ sub message {
 # ------------------
 sub push {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     $obj->printout($data);
@@ -131,7 +131,7 @@ sub push {
 # ------------------
 sub msg {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
     my $err = shift || return $obj->message($data);
 
@@ -141,7 +141,7 @@ sub msg {
 # ------------------
 sub err {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     my $t = Text::ASCIITable->new;
@@ -159,13 +159,13 @@ sub err {
 # ------------------
 sub menu {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     my $t = Text::ASCIITable->new;
     $t->setOptions( $obj->{TableDefaults} );
     $t->setCols(gettext('Module'),
-                gettext('Short cut'),
+                gettext("Abbreviation"),
                 gettext('Name'),
                 gettext('Description'));
 
@@ -183,11 +183,11 @@ sub menu {
 # ------------------
 sub littlemenu {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     my $text = $data->{title}."\n";
-    $text .= gettext("Please use command and one of the following sectors:\n");
+    $text .= gettext("Please use the command and one of the following sectors:\n");
     $text .= join(', ', sort keys %{$data->{links}});
 
     $obj->message($text);
@@ -196,7 +196,7 @@ sub littlemenu {
 # ------------------
 sub login {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
     my $questions = [
@@ -218,7 +218,7 @@ sub login {
 # ------------------
 sub table {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
     my $param = shift || {};
     my $noPrint = shift || 0;
@@ -279,7 +279,7 @@ sub table {
 # ------------------
 sub question {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $title = shift || 0;
     my $questions = shift || return error ('No Data!' );
     my $erg = shift || {};
@@ -302,16 +302,16 @@ sub question {
 
             # Check on directory
             if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name}));
             }
 
             # Check on file
             if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name}));
             }
 
             if($error) {
-                $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error));
+                $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error));
                 last;
             }
         }
@@ -339,7 +339,7 @@ sub question {
 # ------------------
 sub list {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -389,7 +389,7 @@ sub list {
 # ------------------
 sub string {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -430,35 +430,35 @@ sub string {
 # ------------------
 sub file {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->string(@_);
 }
 
 # ------------------
 sub dir {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->string(@_);
 }
 
 # ------------------
 sub password {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->string(@_);
 }
 
 # ------------------
 sub date {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->string(@_);
 }
 
 # ------------------
 sub integer {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -495,7 +495,7 @@ sub integer {
 # ------------------
 sub confirm {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -509,7 +509,7 @@ sub confirm {
             if($data->{def} and ! $answer);
 
         # Only yes or no ...
-        $error = gettext("Please answer with 'y'es or 'n'o: ")
+        $error = gettext("Please answer 'y'es or 'n'o: ")
             if($answer !~ /^[y|n]$/);
 
         # Required value ...
@@ -533,7 +533,7 @@ sub confirm {
 # ------------------
 sub hidden {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
 
     return error('No <def> in hidden Variable!')
@@ -544,16 +544,16 @@ sub hidden {
 # ------------------
 sub image {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data to display');
 
-    return $obj->message(gettext("Sorry, but i cannot display an image on this Interface."));
+    return $obj->message(gettext("Sorry, cannot display images in this interface."));
 }
 
 # ------------------
 sub checkbox {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -586,7 +586,7 @@ sub checkbox {
 # ------------------
 sub radio {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || return error ('No Data!' );
     my $t = $obj->{term};
     my $error;
@@ -603,7 +603,7 @@ sub radio {
             if($data->{req} and not $answer);
 
         # only one of all ...
-        $error = sprintf(gettext("You can only use one of this items: %s"), join(',', @{$data->{choices}}))
+        $error = sprintf(gettext("You can only use one of these elements: %s"), join(',', @{$data->{choices}}))
             unless(grep( $answer eq $_, @{$data->{choices}}));
 
 
@@ -624,7 +624,7 @@ sub radio {
 # ------------------
 sub pod {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $modname = uc(shift) || return error ('No Modname!' );
     $modname = ucfirst($modname) if($modname eq 'GENERAL');
 
@@ -651,7 +651,7 @@ sub pod {
 # ------------------
 sub txtfile {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $filename = shift || return error ('No TxtFile to diplay!' );
     my $param = shift || {};
 
@@ -668,7 +668,7 @@ sub txtfile {
 # ------------------
 sub remote {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
 
     my $text = qq!
 .-----------------------.
@@ -699,7 +699,7 @@ sub remote {
 # ------------------
 sub _myallowansi_cb {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $_      = shift;
     s/\33\[(\d+(;\d+)?)?[musfwhojBCDHRJK]//g;
     return length($_);
@@ -708,7 +708,7 @@ sub _myallowansi_cb {
 # ------------------
 sub _parseData {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $fields  = shift || return error ('No Fields!' );
     my $data    = shift || return error ('No Data!' );
 
diff --git a/lib/XXV/OUTPUT/Dump.pm b/lib/XXV/OUTPUT/Dump.pm
index f82e86e..c7c4d35 100644
--- a/lib/XXV/OUTPUT/Dump.pm
+++ b/lib/XXV/OUTPUT/Dump.pm
@@ -9,12 +9,12 @@ use Tools;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'Dump',
         Prereq => {
         },
-        Description => gettext('This receive and send Dump messages.'),
+        Description => gettext('This receives and sends dump messages.'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -25,7 +25,7 @@ sub module {
 # ------------------
 sub AUTOLOAD {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
 
     return if($AUTOLOAD =~ /DESTROY$/);
 dumper(\@_);
@@ -56,7 +56,7 @@ sub new {
 # ------------------
 sub typ {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{TYP};
 }
 
diff --git a/lib/XXV/OUTPUT/HTML/PUSH.pm b/lib/XXV/OUTPUT/HTML/PUSH.pm
index 7c7d7df..79b05c7 100644
--- a/lib/XXV/OUTPUT/HTML/PUSH.pm
+++ b/lib/XXV/OUTPUT/HTML/PUSH.pm
@@ -49,7 +49,7 @@ sub new {
 # ------------------
 sub start {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $out = shift ||  0;
     $obj->{handle}->print($obj->{cgi}->multipart_init(-boundary=>'----here we go!'));
     $obj->print($out) if($out);
@@ -58,7 +58,7 @@ sub start {
 # ------------------
 sub print {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $msg = shift  || return;
     my $type = shift || 'text/html';
 
@@ -70,7 +70,7 @@ sub print {
 # ------------------
 sub follow_print {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $msg = shift  || return;
     my $type = shift || 'text/html';
 
@@ -84,7 +84,7 @@ sub follow_print {
 # ------------------
 sub stop {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $obj->{handle}->print($obj->{cgi}->multipart_end);
     $obj->{handle}->print($obj->{cgi}->header(
         -type   =>  'text/html',
diff --git a/lib/XXV/OUTPUT/HTML/WAIT.pm b/lib/XXV/OUTPUT/HTML/WAIT.pm
index 8ebd430..8987e38 100644
--- a/lib/XXV/OUTPUT/HTML/WAIT.pm
+++ b/lib/XXV/OUTPUT/HTML/WAIT.pm
@@ -75,7 +75,7 @@ sub new {
 # ------------------
 sub init {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
 
     $obj->{STEP} = 0;
     $obj->{pusher}->start();
@@ -85,7 +85,7 @@ sub init {
 # ------------------
 sub next {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $cur = shift  || $obj->{MAX};
     my $end = shift  || 0;
     my $msg = shift  || 0;
@@ -130,7 +130,7 @@ sub next {
 # ------------------
 sub end {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $msg = shift  || 0;
 
     return $obj->next(undef, $obj->{MAX}, 1, $msg);
@@ -140,28 +140,28 @@ sub end {
 # ------------------
 sub endcallback {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $obj->{endcallback} = shift || return $obj->{endcallback};
 }
 
 # ------------------
 sub max {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $obj->{MAX} = shift || return $obj->{MAX};
 }
 
 # ------------------
 sub min {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $obj->{MIN} = shift || return $obj->{MIN};
 }
 
 # ------------------
 sub screen {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     $obj->{SCREEN} = shift || return $obj->{SCREEN};
 }
 
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm
index af2c6c4..efd36c7 100644
--- a/lib/XXV/OUTPUT/Html.pm
+++ b/lib/XXV/OUTPUT/Html.pm
@@ -19,13 +19,13 @@ $SIG{CHLD} = 'IGNORE';
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'Html',
         Prereq => {
             'HTML::TextToHTML' => 'convert plain text file to HTML. ',
         },
-        Description => gettext('This receive and send HTML messages.'),
+        Description => gettext('This receives and sends HTML messages.'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -37,7 +37,7 @@ sub module {
 # ------------------
 sub AUTOLOAD {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || {};
     my $params = shift || 0;
 
@@ -131,9 +131,9 @@ sub new {
 # ------------------
 sub parseTemplate {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $name = shift || return error ('No Name!' );
-    my $data = shift || return error ('No Data!' );
+    my $obj = shift || return error('No object defined!');
+    my $name = shift || return error('No name defined!');
+    my $data = shift || return error('No data defined!');
     my $params = shift || {};
 
     my $output;
@@ -147,7 +147,7 @@ sub parseTemplate {
 # ------------------
 sub index {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     $obj->{nopack} = 1;
     $obj->{call} = 'index';
     my $params = {};
@@ -159,10 +159,10 @@ sub index {
 # ------------------
 sub parseTemplateFile {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $name = shift || return error ('No Name!' );
-    my $data = shift || return error ('No Data!' );
-    my $params = shift || return error ('No params!' );
+    my $obj = shift || return error('No object defined!');
+    my $name = shift || return error ('No name defined!' );
+    my $data = shift || return error ('No data defined!' );
+    my $params = shift || return error ('No paramters defined!' );
     my $call = shift || 'nothing';
 
     $obj->parseData($data)
@@ -273,8 +273,8 @@ sub parseTemplateFile {
         version => sub{ return main::getVersion },
         loadfile    => sub{ return load_file(@_) },
         writefile   => sub{
-            my $filename = shift || return error('No Filename to write');
-            my $data = shift || return error('Nothing data to write');
+            my $filename = shift || return error('No filename defined!');
+            my $data = shift || return error('No data defined!');
 
             my $dir = $u->userTmp;
 
@@ -308,7 +308,7 @@ sub parseTemplateFile {
 # ------------------
 sub out {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $text = shift || 'no Text for Output';
     my $type = shift || 'text/html';
     my %args = @_;
@@ -325,7 +325,7 @@ sub out {
 # ------------------
 sub printout {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $nopack = shift || $obj->{nopack} || 0;
 
     if($obj->{output} && $obj->{handle}) {
@@ -347,24 +347,10 @@ sub printout {
 }
 
 # ------------------
-sub getType {
-# ------------------
-    my $obj = shift  || return error ('No Object!' );
-    my $typ = shift  || 'text/html';
-
-    my $typefile = sprintf('%s/%s', $obj->{htmdir}, 'GENERICTYP');
-    if(-e $typefile and -r $typefile) {
-        $typ = load_file($typefile);
-        $typ =~ s/[\r|\n]//sig;
-    }
-    return $typ;
-}
-
-# ------------------
 sub header {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $typ = $obj->getType(shift) || return error ('No Type!' );
+    my $obj = shift || return error('No object defined!');
+    my $typ = shift  || 'text/html';
     my $arg = shift || {};
 
     $arg->{'Content-encoding'} = 'gzip'
@@ -387,10 +373,11 @@ sub header {
 # ------------------
 sub statusmsg {
 # ------------------
-    my $obj = shift  || return error ('No Object!');
-    my $state = shift || return error ('No Status!');
+    my $obj = shift  || return error('No object defined!');
+    my $state = shift || return error('No state defined!');
     my $msg = shift;
     my $title = shift;
+    my $typ = shift || 'text/html';
 
     unless(defined $obj->{header}) {
         $obj->{nopack} = 1;
@@ -421,12 +408,11 @@ sub statusmsg {
         $arg->{'WWW-Authenticate'} = "Basic realm=\"xxvd\""
             if($state == 401);
 
-        $arg->{'expires'} = "now"
-            if($state != 304);
+        $arg->{'expires'} = (($state != 304) || (defined $obj->{nocache} && $obj->{nocache})) ? "now" : "+7d";
 
         $obj->{header} = $state;
         $obj->{output_header} = $obj->{cgi}->header(
-            -type   =>  'text/html',
+            -type   =>  $typ,
             -status  => $status,
             %{$arg},
         );
@@ -445,7 +431,7 @@ sub statusmsg {
 # Send HTTP Status 401 (Authorization Required)
 sub login {
 # ------------------
-    my $obj = shift || return error ('No Object!');
+    my $obj = shift || return error('No object defined!');
     my $msg = shift || '';
 
     $obj->statusmsg(401,$msg,gettext("Authorization required"));
@@ -455,7 +441,7 @@ sub login {
 # Send HTTP Status 403 (Access Forbidden)
 sub status403 {
 # ------------------
-    my $obj = shift  || return error ('No Object!');
+    my $obj = shift  || return error('No object defined!');
     my $msg = shift  || '';
 
     $obj->statusmsg(403,$msg,gettext("Forbidden"));
@@ -466,22 +452,22 @@ sub status403 {
 # Send HTTP Status 404 (File not found)
 sub status404 {
 # ------------------
-    my $obj = shift  || return error ('No Object!');
-    my $file = shift || return error ('No File!');
+    my $obj = shift  || return error('No object defined!');
+    my $file = shift || return error('No file defined!');
     my $why = shift || "";
 
     $file =~ s/$obj->{htmdir}\///g; # Don't post html root, avoid spy out
 
-    $obj->statusmsg(404,sprintf(gettext("Can't open file '%s' : %s"),$file,$why),
+    $obj->statusmsg(404,sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why),
                     gettext("Not found"));
 }
 
 # ------------------
 sub question {
 # ------------------
-    my $obj         = shift || return error ('No Object!' );
+    my $obj         = shift || return error('No object defined!');
     my $titel       = shift || 'undef';
-    my $questions   = shift || return error ('No Data!' );
+    my $questions   = shift || return error ('No data defined!');
     my $erg         = shift || 0;
 
     my $q = $obj->{cgi};
@@ -507,12 +493,12 @@ sub question {
 
             # Check on directory
             if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name}));
             }
 
             # Check on file
             if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name}));
             }
 
             # Check on password (is not set the take the old password)
@@ -521,7 +507,7 @@ sub question {
             }
 
             if($error) {
-                $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error));
+                $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error));
                 last;
             }
         }
@@ -558,7 +544,7 @@ sub question {
 # ------------------
 sub wait {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $msg = shift  || gettext("Please wait ...");
     my $min = shift  || 0;
     my $max = shift  || 0;
@@ -610,8 +596,8 @@ sub wait {
 # ------------------
 sub datei {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
-    my $file = shift || return error ('No File!');
+    my $obj = shift  || return error('No object defined!');
+    my $file = shift || return error('No file defined!');
     my $typ = shift;
 
     my %args = ();
@@ -624,12 +610,6 @@ sub datei {
     return $obj->status404($file,$!)
       if(!$blocks);
 
-    # header only if caching
-    $args{'ETag'} = sprintf('%x-%x-%x',$ino, $size, $mtime);
-    return $obj->statusmsg(304)
-        if($obj->{browser}->{'Match'}
-            && $args{'ETag'} eq $obj->{browser}->{'Match'});
-        
     $typ = $obj->{mime}->{lc((split('\.', $file))[-1])}
       if(!$typ);
     $typ = "application/octet-stream"
@@ -638,6 +618,12 @@ sub datei {
     $obj->{nopack} = 1
         if($typ =~ /image\// || $typ =~ /video\//);
 
+    # header only if caching
+    $args{'ETag'} = sprintf('%x-%x-%x',$ino, $size, $mtime);
+    return $obj->statusmsg(304,undef,undef,$typ)
+        if($obj->{browser}->{'Match'}
+            && $args{'ETag'} eq $obj->{browser}->{'Match'});
+
     my(@MON)=qw/Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec/;
     my(@WDAY) = qw/Sun Mon Tue Wed Thu Fri Sat/;
     my($sec,$min,$hour,$mday,$mon,$year,$wday) = gmtime($mtime);
@@ -684,7 +670,7 @@ sub datei {
             } while $r && $bytes > 0;
             close(FH);
           } else {
-            error sprintf("I can't open file '%s' : %s", $file,$!);
+            error sprintf("Could not open file '%s'! : %s", $file,$!);
           }
           $handle->close();
         };
@@ -706,8 +692,8 @@ sub datei {
 # ------------------
 sub image {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
-    my $file = shift || return error ('No File!');
+    my $obj = shift  || return error('No object defined!');
+    my $file = shift || return error('No file defined!');
     my $typ = shift;
     return $obj->datei($file,$typ);
 }
@@ -715,8 +701,8 @@ sub image {
 # ------------------
 sub pod {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $modname = uc(shift) || return error ('No Modname!' );
+    my $obj = shift || return error('No object defined!');
+    my $modname = uc(shift) || return error ('No modul defined!');
     $modname = ucfirst($modname) if($modname eq 'GENERAL');
 
     my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname);
@@ -738,7 +724,7 @@ sub pod {
     my $html = load_file($outfile);
     $html = $1 if($html =~ /\<body.*?\>(.+?)\<\/body\>/si);
     $obj->link({
-        text => gettext("Back to configuration screen"),
+        text => gettext("Back to configuration page."),
         url => $obj->{browser}->{Referer},
     });
 
@@ -748,8 +734,8 @@ sub pod {
 # ------------------
 sub txtfile {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $filename = shift || return error ('No TxtFile to display!' );
+    my $obj = shift || return error('No object defined!');
+    my $filename = shift || return error ('No file defined!');
     my $param = shift || {};
 
     my $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename);
@@ -782,15 +768,15 @@ sub txtfile {
 # ------------------
 sub typ {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{TYP};
 }
 
 # ------------------
 sub setCall {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
-    my $name = shift || return error ('No Name!' );
+    my $obj = shift || return error('No object defined!');
+    my $name = shift || return error ('No name defined!');
 
     $obj->{call} = $name;
     return $obj->{call};
@@ -799,7 +785,7 @@ sub setCall {
 # ------------------
 sub browser {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{browser};
 }
 
@@ -807,7 +793,7 @@ sub browser {
 # ------------------
 sub msg {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $data = shift || 0;
     my $err = shift  || 0;
 
@@ -822,7 +808,7 @@ sub msg {
 # ------------------
 sub parseData {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $dta = shift  || return '';
 
     if(ref $dta eq 'HASH') {
diff --git a/lib/XXV/OUTPUT/NEWS/JABBER.pm b/lib/XXV/OUTPUT/NEWS/JABBER.pm
index 7a6206e..18e5602 100644
--- a/lib/XXV/OUTPUT/NEWS/JABBER.pm
+++ b/lib/XXV/OUTPUT/NEWS/JABBER.pm
@@ -14,7 +14,7 @@ use Locale::gettext;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'NEWS::JABBER',
         Prereq => {
@@ -77,7 +77,7 @@ Then you must receive a message in your running jabber client.
                 },
             },
             level => {
-                description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'),
+                description => gettext('Minimum level of messages which can be displayed (1 ... 100)'),
                 default     => 1,
                 type        => 'integer',
                 required    => gettext('This is required!'),
@@ -90,19 +90,19 @@ Then you must receive a message in your running jabber client.
                 },
             },
             receiveUser => {
-                description => gettext('User to advise (as Jabberaccount to@jabber.server.org)'),
+                description => gettext('User to be notified (as Jabber account to@jabber.server.org)'),
                 default     => '',
                 type        => 'string',
                 required    => gettext('This is required!'),
             },
             user => {
-                description => gettext('Jabberaccount to send message (from@jabber.server.org)'),
+                description => gettext('Jabber account to send message (from@jabber.server.org)'),
                 default     => '',
                 type        => 'string',
                 required    => gettext('This is required!'),
             },
             passwd => {
-                description => gettext('Password from Jabberaccount'),
+                description => gettext('Password for Jabber account'),
                 default     => '',
                 type        => 'password',
                 required    => gettext('This is required!'),
@@ -113,7 +113,7 @@ Then you must receive a message in your running jabber client.
 
                     # If no password given the take the old password as default
                     if($value->[0] and $value->[0] ne $value->[1]) {
-                        return undef, gettext("Field with 1st and 2nd password must be equal to confirm!");
+                        return undef, gettext("The fields with the 1st and the 2nd password must match!");
                     } else {
                         return $value->[0];
                     }
@@ -167,7 +167,7 @@ sub new {
 # ------------------
 sub init {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port});
 
     1;
@@ -176,7 +176,7 @@ sub init {
 # ------------------
 sub jconnect {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
 
     my $jcon = Net::XMPP::Client->new(
         debuglevel  =>  0,
@@ -208,7 +208,7 @@ sub jconnect {
 # ------------------
 sub jdisconnect {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $cnx = shift  || 0;
 
     $cnx->Disconnect()
@@ -221,7 +221,7 @@ sub jdisconnect {
 # ------------------
 sub send {
 # ------------------
-    my $obj     = shift || return error ('No Object!' );
+    my $obj     = shift || return error('No object defined!');
     my $vars    = shift || return error ('No Vars!' );
 
     return undef, lg('This function is deactivated!')
@@ -244,7 +244,7 @@ sub send {
 # ------------------
 sub read {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No News!' );
 
     return $obj->send($vars);
@@ -255,9 +255,9 @@ sub read {
 # ------------------
 sub req {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
 
-    return gettext('The Module NEWS::JABBER is not active!')
+    return gettext('The module NEWS::JABBER is not active!')
         if($obj->{active} ne 'y');
 
     my $vars = {
@@ -277,7 +277,7 @@ sub req {
 # ------------------
 sub xmpp_check_result {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my ($txt,$res,$cnx)=@_;
 
     return error("Error '$txt': result undefined")
diff --git a/lib/XXV/OUTPUT/NEWS/MAIL.pm b/lib/XXV/OUTPUT/NEWS/MAIL.pm
index 93bd187..8ef872b 100644
--- a/lib/XXV/OUTPUT/NEWS/MAIL.pm
+++ b/lib/XXV/OUTPUT/NEWS/MAIL.pm
@@ -15,7 +15,7 @@ use Locale::gettext;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'NEWS::MAIL',
         Prereq => {
@@ -41,7 +41,7 @@ sub module {
                 },
             },
             level => {
-                description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'),
+                description => gettext('Minimum level of messages which can be displayed (1 ... 100)'),
                 default     => 1,
                 type        => 'integer',
                 required    => gettext('This is required!'),
@@ -68,24 +68,24 @@ sub module {
                 },
             },
             address => {
-                description => gettext('One or more mail addresses for sending the news'),
+                description => gettext('One or more mail addresses for sending the messages'),
                 default     => 'unknown@example.com, everybody@example.com',
                 type        => 'string',
                 required    => gettext('This is required!'),
             },
             from_address => {
-                description => gettext('Mail address to senders describe.'),
+                description => gettext('Mail address to describe the sender.'),
                 default     => 'xxv@vdr.de',
                 type        => 'string',
             },
             smtp => {
-                description => gettext('Hostname from SMTP mail server'),
+                description => gettext('SMTP mail server host name'),
                 default     => main::getModule('STATUS')->name,
                 type        => 'host',
                 required    => gettext('This is required!'),
             },
             susr => {
-                description => gettext('Username for mail server access'),
+                description => gettext('User name for mail server access'),
                 default     => 'xxv',
                 type        => 'string',
             },
@@ -100,7 +100,7 @@ sub module {
 
                     # If no password given the take the old password as default
                     if($value->[0] and $value->[0] ne $value->[1]) {
-                        return undef, gettext("Field with 1st and 2nd password must be equal to confirm!");
+                        return undef, gettext("The fields with the 1st and the 2nd password must match!");
                     } else {
                         return $value->[0];
                     }
@@ -172,7 +172,7 @@ sub new {
 # ------------------
 sub init {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     $obj->{INITE} = 1;
 
     $obj->{LastReportTime} = time;
@@ -194,7 +194,7 @@ sub init {
 # ------------------
 sub send {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
 
     return error('This function is deactivated!')
         if($obj->{active} ne 'y');
@@ -230,7 +230,7 @@ sub send {
 # ------------------
 sub parseHeader {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $output = '';
 
     my $vars = {
@@ -249,7 +249,7 @@ sub parseHeader {
 # ------------------
 sub parseFooter {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $output = '';
 
 
@@ -270,7 +270,7 @@ sub parseFooter {
 # ------------------
 sub read {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No News!' );
 
     my $output = '';
@@ -290,16 +290,16 @@ sub read {
 # ------------------
 sub req {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $test = shift  || 0;
 
-    return gettext('The Module NEWS::Mail is not active!')
+    return gettext('The module NEWS::Mail is not active!')
         if($obj->{active} ne 'y');
 
     my $content = '';
     if($test) {
         $obj->send;
-        $content .= gettext('A mail with the following content is send to your Mailaccount!');
+        $content .= gettext('A mail with the following content has been sent to your mail account!');
         $content .= "\n\n";
     }
 
diff --git a/lib/XXV/OUTPUT/NEWS/RSS.pm b/lib/XXV/OUTPUT/NEWS/RSS.pm
index 43178d4..129452b 100644
--- a/lib/XXV/OUTPUT/NEWS/RSS.pm
+++ b/lib/XXV/OUTPUT/NEWS/RSS.pm
@@ -14,13 +14,13 @@ use Locale::gettext;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'NEWS::RSS',
         Prereq => {
             'XML::RSS' => 'SMTP Protocol module to connect and send emails',
         },
-        Description => gettext('This NEWS module generate an RSS Newsfeed for your rss reader.'),
+        Description => gettext('This NEWS module generates an RSS news feed for your RSS reader.'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -40,7 +40,7 @@ sub module {
                 },
             },
             level => {
-                description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'),
+                description => gettext('Minimum level of messages which can be displayed (1 ... 100)'),
                 default     => 1,
                 type        => 'integer',
                 required    => gettext('This is required!'),
@@ -102,7 +102,7 @@ sub new {
 # ------------------
 sub init {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     $obj->{INITE} = 1;
 
     1;
@@ -111,7 +111,7 @@ sub init {
 # ------------------
 sub createRSS {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $ver  = shift || 1;
     my $account = sprintf("%s@%s", $ENV{USER}, main::getModule('STATUS')->name);
     my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port});
@@ -126,10 +126,10 @@ sub createRSS {
         $rss->channel(
             title        => gettext("XXV RSS 1.0"),
             'link'         => $url,
-            description  => gettext("Important messages from your vdr/xxv"),
+            description  => gettext("Important messages from your VDR/XXV"),
             dc => {
                 date       => datum(time,'int'),
-                subject    => gettext("XXV Messages"),
+                subject    => gettext("XXV messages"),
                 creator    => $account,
                 language   => setlocale(POSIX::LC_MESSAGES),
             },
@@ -150,7 +150,7 @@ sub createRSS {
         $rss->channel(
             title          => gettext("XXV RSS 2.0"),
             'link'         => $url,
-            description    => gettext("Important messages from your vdr/xxv"),
+            description    => gettext("Important messages from your VDR/XXV"),
             language       => setlocale(POSIX::LC_MESSAGES),
             pubDate        => datum(time, 'rss'),
             lastBuildDate  => datum($lastbuild, 'rss'),
@@ -166,7 +166,7 @@ sub createRSS {
 # ------------------
 sub send {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No Vars!' );
 
     ++$obj->{COUNT};
@@ -186,7 +186,7 @@ sub send {
 # ------------------
 sub read {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No News!' );
 
     return undef, lg('This function is deactivated!')
@@ -205,10 +205,10 @@ sub read {
 # ------------------
 sub req {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $params = shift || {};
 
-    return gettext('The Module NEWS::RSS is not active!')
+    return gettext('The module NEWS::RSS is not active!')
         if($obj->{active} ne 'y');
 
     my $rss = $obj->createRSS($params->{version})
diff --git a/lib/XXV/OUTPUT/NEWS/VDR.pm b/lib/XXV/OUTPUT/NEWS/VDR.pm
index 9568e15..38ad12a 100644
--- a/lib/XXV/OUTPUT/NEWS/VDR.pm
+++ b/lib/XXV/OUTPUT/NEWS/VDR.pm
@@ -14,10 +14,10 @@ use Locale::gettext;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'NEWS::VDR',
-        Description => gettext('This NEWS module generate a messages for vdr interface.'),
+        Description => gettext('This NEWS module generates messages for the VDR interface.'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -37,7 +37,7 @@ sub module {
                 },
             },
             level => {
-                description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'),
+                description => gettext('Minimum level of messages which can be displayed (1 ... 100)'),
                 default     => 1,
                 type        => 'integer',
                 required    => gettext('This is required!'),
@@ -97,7 +97,7 @@ sub new {
 # ------------------
 sub init {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port});
     $obj->{INITE} = 1;
 
@@ -109,7 +109,7 @@ sub init {
 # ------------------
 sub send {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No Vars!' );
 
     return undef, lg('This function is deactivated!')
@@ -130,7 +130,7 @@ sub send {
 # ------------------
 sub read {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $vars = shift || return error ('No News!' );
 
     return $obj->send($vars);
@@ -141,10 +141,10 @@ sub read {
 # ------------------
 sub req {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $test = shift  || 0;
 
-    return gettext('The Module NEWS::VDR is not active!')
+    return gettext('The module NEWS::VDR is not active!')
         if($obj->{active} ne 'y');
 
     my $vars = {
@@ -158,7 +158,7 @@ sub req {
     };
     $obj->read($vars);
 
-    return gettext('A message is send to your SVDRPServer!');
+    return gettext('A message has been sent to your VDR!');
 
 }
 
diff --git a/lib/XXV/OUTPUT/Wml.pm b/lib/XXV/OUTPUT/Wml.pm
index f3bda9f..2d2ff59 100644
--- a/lib/XXV/OUTPUT/Wml.pm
+++ b/lib/XXV/OUTPUT/Wml.pm
@@ -12,13 +12,13 @@ use Pod::Html;
 # ------------------
 sub module {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $args = {
         Name => 'Wml',
         Prereq => {
             'Template'  => 'Front-end module to the Template Toolkit ',
         },
-        Description => gettext('This receive and send Wap messages.'),
+        Description => gettext('This receives and sends WAP messages.'),
         Version => (split(/ /, '$Revision$'))[1],
         Date => (split(/ /, '$Date$'))[1],
         Author => 'xpix',
@@ -30,7 +30,7 @@ sub module {
 # ------------------
 sub AUTOLOAD {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || {};
     my $params = shift || 0;
 
@@ -106,7 +106,7 @@ sub new {
 # ------------------
 sub parseTemplate {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $name = shift || return error ('No Name!' );
     my $data = shift || return error ('No Data!' );
     my $params = shift || {};
@@ -175,7 +175,7 @@ sub parseTemplate {
 # ------------------
 sub out {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $text = shift || 'no Text for Output';
     my $type = shift || 'text/vnd.wap.wml';
     my %args = @_;
@@ -194,7 +194,7 @@ sub out {
 # ------------------
 sub header {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $typ = shift || return error ('No Type!' );
     my $arg = shift || {};
 
@@ -264,13 +264,13 @@ sub status404 {
 
     $file =~ s/$obj->{wmldir}\///g; # Don't post wml root, avoid spy out
 
-    $obj->statusmsg(sprintf(gettext("Can't open file '%s' : %s"),$file,$why),"404 File not found");
+    $obj->statusmsg(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why),"404 File not found");
 }
 
 # ------------------
 sub question {
 # ------------------
-    my $obj         = shift || return error ('No Object!' );
+    my $obj         = shift || return error('No object defined!');
     my $titel       = shift || 'undef';
     my $questions   = shift || return error ('No Data!' );
     my $erg         = shift || 0;
@@ -294,16 +294,16 @@ sub question {
 
             # Check on directory
             if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name}));
             }
 
             # Check on file
             if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) {
-                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name}));
+                ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name}));
             }
 
             if($error) {
-                $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error));
+                $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error));
                 last;
             }
         }
@@ -337,7 +337,7 @@ sub question {
 # ------------------
 sub image {
 # ------------------
-    my $obj = shift  || return error ('No Object!' );
+    my $obj = shift  || return error('No object defined!');
     my $file = shift || return error ('No File!' );
     my $typ = shift  || $obj->{mime}->{lc((split('\.', $file))[-1])}
         or return error("No Type in Mimehash or File: $file");
@@ -351,7 +351,7 @@ sub image {
 # ------------------
 sub datei {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $file = shift || return error ('No File!' );
 
     my $data = load_file($file)
@@ -363,7 +363,7 @@ sub datei {
 # ------------------
 sub pod {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $modname = shift || return error ('No Modname!' );
     $modname = ucfirst($modname) if($modname eq 'GENERAL');
 
@@ -382,7 +382,7 @@ sub pod {
     my $html = load_file($outfile);
     $html = $1 if($html =~ /\<body.*?\>(.+?)\<\/body\>/si);
     $obj->link({
-        text => gettext("Back to configuration screen"),
+        text => gettext("Back to configuration page."),
         url => $obj->{browser}->{Referer},
     });
     $obj->message($html);
@@ -391,14 +391,14 @@ sub pod {
 # ------------------
 sub typ {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{TYP};
 }
 
 # ------------------
 sub setCall {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $name = shift || return error ('No Name!' );
 
     $obj->{call} = $name;
@@ -408,7 +408,7 @@ sub setCall {
 # ------------------
 sub browser {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     return $obj->{browser};
 }
 
@@ -416,7 +416,7 @@ sub browser {
 # ------------------
 sub msg {
 # ------------------
-    my $obj = shift || return error ('No Object!' );
+    my $obj = shift || return error('No object defined!');
     my $data = shift || {};
     my $err = shift;