* Update english translation

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

4 files changed, 50 insertions, 50 deletions

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!');
 
 }