[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, debian-sid, updated. 83c29c626560a053ccd943bae06afb9ad89d3e92
Gregory Colpart
reg at foulademer.gcolpart.com
Fri May 1 15:15:49 UTC 2009
The following commit has been merged in the debian-sid branch:
commit d243540ca9f6f6a53d50365d2e9dc66330430f6d
Author: Gregory Colpart <reg at foulademer.gcolpart.com>
Date: Fri May 1 16:26:30 2009 +0200
merge from upstream
diff --git a/config/prefs.php.dist b/config/prefs.php.dist
index c651d81..fe645fb 100644
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@ -1,13 +1,12 @@
<?php
/**
- * $Horde: ingo/config/prefs.php.dist,v 1.30.10.2 2008/05/09 22:22:59 jan Exp $
+ * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008/06/15 21:14:38 chuck Exp $
*
* See horde/config/prefs.php for documentation on the structure of this file.
*/
// Make sure that INGO_STORAGE_* constants are defined.
- at define('INGO_BASE', dirname(__FILE__) . '/..');
-require_once INGO_BASE . '/lib/Storage.php';
+require_once dirname(__FILE__) . '/../lib/Storage.php';
// This preference group will only be displayed if the configured
// Ingo_Script:: driver can create script files.
diff --git a/docs/CHANGES b/docs/CHANGES
index 0e03759..8c08e1e 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,3 +1,23 @@
+------
+v1.2.1
+------
+
+[jan] Don't show script icon in menu if preference to automatically update
+ scripts is both set and locked (Request #7251).
+[mjr] Change MDB2 sequence name to 'id' (Bug 7240)
+[jan] Fix adding more than 5 wildcard blacklists (Bug #7077).
+[jan] Add Basque translation (Euskal Herriko Unibertsitatea EHU/UPV
+ <xabier.arrieta at ehu.es>).
+[jan] Fix saving spam rules in the preference backend (Bug #7033).
+[jan] Correctly catch dates before the 10th of a month in Sieve timed
+ vacations (Bug #7023).
+[mas] Fix vacation with procmail driver (Bugs #6509, #7052).
+[jan] Fix moving to INBOX with the maildrop driver.
+[jan] Disable drop down entries with informational purpose only.
+[jan] Fix filter activity messages with non-ASCII folder names
+ (taguchi at iij.ad.jp, Bug #6764).
+
+
----
v1.2
----
@@ -101,7 +121,7 @@ v1.2-ALPHA
#4278)
[jmf] Blacklist and whitelist for imap scripts now work consistently with
sieve scripts -- must match full address.
-[ben] Add body test for procmail (horde at coursimault.com,
+[ben] Add body test for procmail (horde at coursimault.com,
Requests #3874, #4035).
[cjh] Add ssh2 to the supported VFS backends (Cliff Green <green at umdnj.edu>).
[cjh] Add checks to avoid mail loops in the procmail forwards code
diff --git a/docs/CREDITS b/docs/CREDITS
index 6dbad52..ac356cf 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -14,7 +14,10 @@ Localization
============
===================== ======================================================
+Basque Euskal Herriko Unibertsitatea <xabier.arrieta at ehu.es>
Brazilian Portuguese Fabio Gomes <flgoms at uol.com.br>
+ Luis Felipe Marzagao <duli at fedoraproject.org>
+ Eduardo de Carli <carliedu at ig.com.br>
Catalan Jordi Giralt <projecte.k2 at upcnet.es>
Chinese (Simplified) Anna Chen <annachen2008 at yahoo.com.cn>
Chinese (Traditional) David Chang <david at tmv.gov.tw>
@@ -23,6 +26,7 @@ Danish Brian Truelsen <horde+i18n at briantruelsen.dk>
Dutch Ruben van der Steenhoven
<ruben_donotspamme at webmeesters.net>
Estonian Toomas Aas <toomas.aas at mail.ee>
+ Alar Sing <alar.sing at err.ee>
Finnish Leena Heino <Leena.Heino at uta.fi>
French Florent Aide <faide at alphacent.com>
Benoit St-André <ben at benoitst-andre.net>
diff --git a/docs/RELEASE_NOTES b/docs/RELEASE_NOTES
index 4cbb804..67b3a4b 100644
--- a/docs/RELEASE_NOTES
+++ b/docs/RELEASE_NOTES
@@ -12,36 +12,28 @@
* 8 - Minor security fixes
* 9 - Major security fixes
*/
-$this->notes['fm']['focus'] = 5;
+$this->notes['fm']['focus'] = 6;
/* Mailing list release notes. */
$this->notes['ml']['changes'] = <<<ML
The Horde Team is pleased to announce the final release of the Ingo Email
-Filter Rules Manager version H3 (1.2).
+Filter Rules Manager version H3 (1.2.1).
Ingo is an email-filter management application. It is fully internationalized,
integrated with Horde and the IMP Webmail client, and supports both
server-side (Sieve, procmail) and client-side (IMAP) rule creation.
-Ingo version H3 (1.2) is a major upgrade in the 1.x release series, including
-these enhancements:
- * WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance.
- * Timed vacation messages (I will be away from X to Y).
- * Major improvements to the procmail driver, including negative matches,
- body tests, loop prevention in vacation messages, full character set
- support,
- * Maildrop driver improvements, including vacation support and full
- character set support in the maildrop driver.
- * Sieve driver improvements, including numeric spam score tests, sivtest
- support, and quota checks before uploading sieve rules.
- * Filter rules can be stored in a SQL database.
- * Administrators can change other user's filter rules.
- * Added Japanese, Russian and Slovak translations.
+Major changes compared to the Ingo H3 (1.2) version are:
+ * Added ability to hide the script icon.
+ * Added Basque translation.
+ * Several bug fixes.
ML;
/* Freshmeat release notes. */
$this->notes['fm']['changes'] = <<<FM
-New in this release: WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance; support for timed vacation messages (I will be away from X to Y); Procmail improvements including negative matches, body tests, vacation mail loop prevention, and full charset support; Maildrop improvements including vacation support and full character set support; Sieve improvements including a sivtest driver, numeric spam score tests, and quota support; the ability to store filter rules in a SQL database; Administrators can edit other user's filter rules; and many more bug fixes and improvements.
+An ability to hide the script icon has been added.
+A Basque translation has been added.
+Several bugs have been fixed.
FM;
$this->notes['name'] = 'Ingo';
diff --git a/docs/UPGRADING b/docs/UPGRADING
index 64e0e62..7bc08c5 100644
--- a/docs/UPGRADING
+++ b/docs/UPGRADING
@@ -2,15 +2,29 @@
Upgrading Ingo
================
-:Last update: $Date: 2008/04/30 03:37:38 $
-:Revision: $Revision: 1.1.2.5 $
+:Last update: $Date: 2008/09/11 22:05:09 $
+:Revision: $Revision: 1.1.2.10 $
:Contact: ingo at lists.horde.org
+These are instructions to upgrade from earlier Ingo versions. Please
+backup your existing data before running any of the steps described below.
-Upgrading Ingo From 1.1.x To 1.2.x
+
+Upgrading Ingo From 1.2 To 1.2.1
+================================
+
+The share_owner field in the SQL share driver table has been changed from a
+VARCHAR(32) to a VARCHAR(255). Execute the provided SQL script to update your
+database if you are using the native SQL share driver.
+
+ mysql --user=root --password=<MySQL-root-password> <db name> < 1.2_to_1.2.1.sql
+
+
+Upgrading Ingo From 1.1.x To 1.2
==================================
+
This is a non-exhaustive, quick explanation of what has changed between Ingo
version 1.1.x and 1.2.x.
diff --git a/lib/Ingo.php b/lib/Ingo.php
index a86bba4..16584f0 100644
--- a/lib/Ingo.php
+++ b/lib/Ingo.php
@@ -8,7 +8,7 @@ define('INGO_BLACKLIST_MARKER', '++DELETE++');
/**
* Ingo base class.
*
- * $Horde: ingo/lib/Ingo.php,v 1.69.6.18 2008/04/17 14:46:41 chuck Exp $
+ * $Horde: ingo/lib/Ingo.php,v 1.69.6.21 2008/09/01 12:05:25 jan Exp $
*
* See the enclosed file LICENSE for license information (ASL). If you
* did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -56,7 +56,7 @@ class Ingo {
$text .= '"';
}
$text .= ">\n";
- $text .= '<option value="">' . _("Select target folder") . "</option>\n";
+ $text .= '<option disabled="disabled" value="">' . _("Select target folder") . "</option>\n";
if ($registry->hasMethod('mail/createFolder')) {
$text .= '<option value="">' . _("Create new folder") . "</option>\n";
@@ -66,9 +66,12 @@ class Ingo {
foreach ($mailboxes as $mbox) {
$sel = ($mbox['val'] && ($mbox['val'] === $value)) ? ' selected="selected"' : '';
+ $disabled = empty($mbox['val']) ? ' disabled="disabled"' : '';
$val = htmlspecialchars($mbox['val']);
$label = $mbox['abbrev'];
- $text .= sprintf('<option value="%s"%s>%s</option>%s', $val, $sel, Text::htmlSpaces($label), "\n");
+ $text .= sprintf('<option%s value="%s"%s>%s</option>%s',
+ $disabled, $val, $sel,
+ Text::htmlSpaces($label), "\n");
}
$text .= '</select>';
@@ -392,7 +395,9 @@ class Ingo {
if (in_array(INGO_STORAGE_ACTION_SPAM, $_SESSION['ingo']['script_categories'])) {
$menu->add(Horde::applicationUrl('spam.php'), _("S_pam"), 'spam.png');
}
- if ($_SESSION['ingo']['script_generate']) {
+ if ($_SESSION['ingo']['script_generate'] &&
+ (!$GLOBALS['prefs']->isLocked('auto_update') ||
+ !$GLOBALS['prefs']->getValue('auto_update'))) {
$menu->add(Horde::applicationUrl('script.php'), _("_Script"), 'script.png');
}
if (!empty($GLOBALS['ingo_shares']) && empty($GLOBALS['conf']['share']['no_sharing'])) {
diff --git a/lib/Script/imap.php b/lib/Script/imap.php
index 236249e..75a3611 100644
--- a/lib/Script/imap.php
+++ b/lib/Script/imap.php
@@ -3,7 +3,7 @@
* The Ingo_Script_imap:: class represents an IMAP client-side script
* generator.
*
- * $Horde: ingo/lib/Script/imap.php,v 1.49.10.15 2008/01/02 11:32:11 jan Exp $
+ * $Horde: ingo/lib/Script/imap.php,v 1.49.10.17 2008/06/19 08:32:07 jan Exp $
*
* Copyright 2003-2008 The Horde Project (http://www.horde.org/)
*
@@ -303,15 +303,17 @@ class Ingo_Script_imap extends Ingo_Script {
/* Display notification message(s). */
if ($detailmsg) {
foreach ($overview as $msg) {
- $notification->push(sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been moved to the folder \"%s\"."),
- isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"),
- MIME::decode($msg->from, NLS::getCharset()),
- $rule['action-value']), 'horde.message');
+ $notification->push(
+ sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been moved to the folder \"%s\"."),
+ isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"),
+ isset($msg->from) ? MIME::decode($msg->from, NLS::getCharset()) : _("[No Sender]"),
+ String::convertCharset($rule['action-value'], 'UTF7-IMAP', NLS::getCharset())),
+ 'horde.message');
}
} else {
$notification->push(sprintf(_("Filter activity: %s message(s) have been moved to the folder \"%s\"."),
count($indices),
- $rule['action-value']), 'horde.message');
+ String::convertCharset($rule['action-value'], 'UTF7-IMAP', NLS::getCharset())), 'horde.message');
}
} elseif ($rule['action'] == INGO_STORAGE_ACTION_DISCARD) {
/* We need to grab the overview first. */
@@ -326,9 +328,11 @@ class Ingo_Script_imap extends Ingo_Script {
/* Display notification message(s). */
if ($detailmsg) {
foreach ($overview as $msg) {
- $notification->push(sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been deleted."),
- isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"),
- MIME::decode($msg->from, NLS::getCharset())), 'horde.message');
+ $notification->push(
+ sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been deleted."),
+ isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"),
+ isset($msg->from) ? MIME::decode($msg->from, NLS::getCharset()) : _("[No Sender]")),
+ 'horde.message');
}
} else {
$notification->push(sprintf(_("Filter activity: %s message(s) have been deleted."), count($indices)), 'horde.message');
@@ -342,10 +346,15 @@ class Ingo_Script_imap extends Ingo_Script {
if ($detailmsg) {
$overview = $this->_api->fetchMessageOverviews($sequence);
foreach ($overview as $msg) {
- $notification->push(sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been copied to the folder \"%s\"."), isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"), MIME::decode($msg->from, NLS::getCharset()), $rule['action-value']), 'horde.message');
+ $notification->push(
+ sprintf(_("Filter activity: The message \"%s\" from \"%s\" has been copied to the folder \"%s\"."),
+ isset($msg->subject) ? MIME::decode($msg->subject, NLS::getCharset()) : _("[No Subject]"),
+ isset($msg->from) ? MIME::decode($msg->from, NLS::getCharset()) : _("[No Sender]"),
+ String::convertCharset($rule['action-value'], 'UTF7-IMAP', NLS::getCharset())),
+ 'horde.message');
}
} else {
- $notification->push(sprintf(_("Filter activity: %s message(s) have been copied to the folder \"%s\"."), count($indices), $rule['action-value']), 'horde.message');
+ $notification->push(sprintf(_("Filter activity: %s message(s) have been copied to the folder \"%s\"."), count($indices), String::convertCharset($rule['action-value'], 'UTF7-IMAP', NLS::getCharset())), 'horde.message');
}
}
}
diff --git a/lib/Script/maildrop.php b/lib/Script/maildrop.php
index 816d074..cc60375 100644
--- a/lib/Script/maildrop.php
+++ b/lib/Script/maildrop.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Horde: ingo/lib/Script/maildrop.php,v 1.7.2.10 2007/12/27 05:10:43 chuck Exp $
+ * $Horde: ingo/lib/Script/maildrop.php,v 1.7.2.11 2008/06/01 23:04:02 jan Exp $
*
* Copyright 2005-2007 Matt Weyland <mathias at weyland.ch>
*
@@ -667,8 +667,8 @@ class Maildrop_Recipe {
}
/**
- * Returns a maildrop-ready mailbox path, converting IMAP folder
- * pathname conventions as necessary.
+ * Returns a maildrop-ready mailbox path, converting IMAP folder pathname
+ * conventions as necessary.
*
* @param string $folder The IMAP folder name.
*
@@ -680,15 +680,16 @@ class Maildrop_Recipe {
if (isset($this->_params) &&
($this->_params['path_style'] == 'maildir')) {
if (empty($folder) || ($folder == 'INBOX')) {
- return 'to "${DEFAULT}';
+ return '"${DEFAULT}"';
}
- if ($this->_params['strip_inbox'] && substr($folder, 0, 6) == 'INBOX.') {
+ if ($this->_params['strip_inbox'] &&
+ substr($folder, 0, 6) == 'INBOX.') {
$folder = substr($folder, 6);
}
return '"${DEFAULT}/.' . $folder . '/"';
} else {
if (empty($folder) || ($folder == 'INBOX')) {
- return 'to ${DEFAULT}';
+ return '${DEFAULT}';
}
return str_replace(' ', '\ ', $folder);
}
diff --git a/lib/Script/procmail.php b/lib/Script/procmail.php
index 20142a5..6e7453d 100644
--- a/lib/Script/procmail.php
+++ b/lib/Script/procmail.php
@@ -2,7 +2,7 @@
/**
* The Ingo_Script_procmail:: class represents a Procmail script generator.
*
- * $Horde: ingo/lib/Script/procmail.php,v 1.46.10.28 2008/05/05 17:22:21 selsky Exp $
+ * $Horde: ingo/lib/Script/procmail.php,v 1.46.10.30 2008/08/18 12:52:54 jan Exp $
*
* Copyright 2003-2008 The Horde Project (http://www.horde.org/)
*
@@ -488,7 +488,8 @@ class Procmail_Recipe {
$this->_action[] = ' :0 Whc: ${VACATION_DIR:-.}/vacation.lock';
if ($timed) {
$this->_action[] = ' * ? test $DATE -gt $START && test $END -gt $DATE';
- $this->_action[] = ' :0 Whaf';
+ $this->_action[] = ' {';
+ $this->_action[] = ' :0 Whc';
}
$this->_action[] = ' * ^TO_' . $address;
$this->_action[] = ' * !^X-Loop: ' . $address;
@@ -504,23 +505,28 @@ class Procmail_Recipe {
$this->_action[] = ' * !^FROM_DAEMON';
}
$this->_action[] = ' | formail -rD 8192 ${VACATION_DIR:-.}/.vacation.' . $address;
- $this->_action[] = ' :0 ehc';
- $this->_action[] = ' | (formail -rI"Precedence: junk" \\';
- $this->_action[] = ' -a"From: <' . $address . '>" \\';
- $this->_action[] = ' -A"X-Loop: ' . $address . '" \\';
+ $this->_action[] = ' :0 ehc';
+ $this->_action[] = ' | (formail -rI"Precedence: junk" \\';
+ $this->_action[] = ' -a"From: <' . $address . '>" \\';
+ $this->_action[] = ' -A"X-Loop: ' . $address . '" \\';
if (MIME::is8bit($params['action-value']['reason'])) {
- $this->_action[] = ' -i"Subject: ' . MIME::encode($params['action-value']['subject'] . ' (Re: $SUBJECT)', NLS::getCharset()) . '" \\';
- $this->_action[] = ' -i"Content-Transfer-Encoding: quoted-printable" \\';
- $this->_action[] = ' -i"Content-Type: text/plain; charset=' . NLS::getCharset() . '" ; \\';
+ $this->_action[] = ' -i"Subject: ' . MIME::encode($params['action-value']['subject'] . ' (Re: $SUBJECT)', NLS::getCharset()) . '" \\';
+ $this->_action[] = ' -i"Content-Transfer-Encoding: quoted-printable" \\';
+ $this->_action[] = ' -i"Content-Type: text/plain; charset=' . NLS::getCharset() . '" ; \\';
$reason = MIME::quotedPrintableEncode($params['action-value']['reason'], "\n");
} else {
- $this->_action[] = ' -i"Subject: ' . MIME::encode($params['action-value']['subject'] . ' (Re: $SUBJECT)', NLS::getCharset()) . '" ; \\';
+ $this->_action[] = ' -i"Subject: ' . MIME::encode($params['action-value']['subject'] . ' (Re: $SUBJECT)', NLS::getCharset()) . '" ; \\';
$reason = $params['action-value']['reason'];
}
$reason = addcslashes($reason, "\\\n\r\t\"`");
- $this->_action[] = ' ' . $this->_params['echo'] . ' -e "' . $reason . '" \\';
- $this->_action[] = ' ) | $SENDMAIL -f' . $address . ' -oi -t';
+ $this->_action[] = ' ' . $this->_params['echo'] . ' -e "' . $reason . '" \\';
+ $this->_action[] = ' ) | $SENDMAIL -f' . $address . ' -oi -t';
$this->_action[] = '';
+ $this->_action[] = ' :0';
+ $this->_action[] = ' /dev/null';
+ if ($timed) {
+ $this->_action[] = ' }';
+ }
}
}
$this->_action[] = '}';
diff --git a/lib/Script/sieve.php b/lib/Script/sieve.php
index 5ab5264..d7c1a58 100644
--- a/lib/Script/sieve.php
+++ b/lib/Script/sieve.php
@@ -2,7 +2,7 @@
/**
* The Ingo_Script_sieve class represents a Sieve Script.
*
- * $Horde: ingo/lib/Script/sieve.php,v 1.63.10.34 2007/12/20 14:05:48 jan Exp $
+ * $Horde: ingo/lib/Script/sieve.php,v 1.63.10.36 2008/07/17 22:55:30 jan Exp $
*
* See the enclosed file LICENSE for license information (ASL). If you
* did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -115,7 +115,14 @@ class Ingo_Script_sieve extends Ingo_Script {
*/
function toCode()
{
- $code = "# Sieve Filter\n# " . _("Generated by Ingo (http://www.horde.org/ingo/)") . ' (' . date('F j, Y, g:i a') . ")\n\n";
+ $date_format = $GLOBALS['prefs']->getValue('date_format');
+ // %R and %r don't work on Windows, but who runs a Sieve backend on a
+ // Windows server?
+ $time_format = $GLOBALS['prefs']->getValue('twentyFour') ? '%R' : '%r';
+ $code = "# Sieve Filter\n# "
+ . _("Generated by Ingo (http://www.horde.org/ingo/)") . ' ('
+ . trim(strftime($date_format . ', ' . $time_format))
+ . ")\n\n";
$code = String::convertCharset($code, NLS::getCharset(), 'UTF-8');
$requires = $this->requires();
@@ -291,7 +298,7 @@ class Ingo_Script_sieve extends Ingo_Script {
$test = new Sieve_Test_Address(array('headers' => "From\nSender\nResent-From", 'match-type' => ':matches', 'addresses' => implode("\n", $wildcards)));
$if = new Sieve_If($test);
$if->setActions($action);
- $this->addblock($if);
+ $this->_blocks[] = $if;
$wildcards = array();
}
}
@@ -365,19 +372,25 @@ class Ingo_Script_sieve extends Ingo_Script {
'reason' => String::convertCharset($vacation->getVacationReason(), NLS::getCharset(), 'UTF-8'),
);
- require_once 'Horde/MIME/Headers.php';
- $mime_headers = new MIME_Headers();
- $listHeaders = $mime_headers->listHeaders();
-
$action = $tests = array();
$action[] = new Sieve_Action_Vacation($vals);
if ($vacation->getVacationIgnorelist()) {
- $tmp = new Sieve_Test_Exists(array('headers' => implode("\n", array_keys($listHeaders))));
+ require_once 'Horde/MIME/Headers.php';
+ $mime_headers = new MIME_Headers();
+ $headers = $mime_headers->listHeaders();
+ $headers['Mailing-List'] = null;
+ $tmp = new Sieve_Test_Exists(array('headers' => implode("\n", array_keys($headers))));
$tests[] = new Sieve_Test_Not($tmp);
$vals = array('headers' => 'Precedence',
'match-type' => ':is',
- 'strings' => "list\nbulk",
+ 'strings' => "list\nbulk\njunk",
+ 'comparator' => 'i;ascii-casemap');
+ $tmp = new Sieve_Test_Header($vals);
+ $tests[] = new Sieve_Test_Not($tmp);
+ $vals = array('headers' => 'To',
+ 'match-type' => ':matches',
+ 'strings' => 'Multiple recipients of*',
'comparator' => 'i;ascii-casemap');
$tmp = new Sieve_Test_Header($vals);
$tests[] = new Sieve_Test_Not($tmp);
@@ -1990,10 +2003,18 @@ class Sieve_Test_Header extends Sieve_Test {
*/
function Sieve_Test_Header($vars = array())
{
- $this->_vars['headers'] = isset($vars['headers']) ? $vars['headers'] : 'Subject';
- $this->_vars['comparator'] = isset($vars['comparator']) ? $vars['comparator'] : 'i;ascii-casemap';
- $this->_vars['match-type'] = isset($vars['match-type']) ? $vars['match-type'] : ':is';
- $this->_vars['strings'] = isset($vars['strings']) ? $vars['strings'] : '';
+ $this->_vars['headers'] = isset($vars['headers'])
+ ? $vars['headers']
+ : 'Subject';
+ $this->_vars['comparator'] = isset($vars['comparator'])
+ ? $vars['comparator']
+ : 'i;ascii-casemap';
+ $this->_vars['match-type'] = isset($vars['match-type'])
+ ? $vars['match-type']
+ : ':is';
+ $this->_vars['strings'] = isset($vars['strings'])
+ ? $vars['strings']
+ : '';
}
/**
@@ -2722,7 +2743,7 @@ class Sieve_Action_Vacation extends Sieve_Action {
*/
function _yearCheck($begin, $end)
{
- $code = 'if header :regex "Received" "^.*(' . $begin;
+ $code = 'if header :regex "Received" "^.*(' . $begin;
for ($i = $begin + 1; $i <= $end; $i++) {
$code .= '|' . $i;
}
@@ -2737,7 +2758,7 @@ class Sieve_Action_Vacation extends Sieve_Action {
{
$months = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
- $code = 'if header :regex "Received" "^.*(' . $months[$begin - 1];
+ $code = 'if header :regex "Received" "^.*(' . $months[$begin - 1];
for ($i = $begin + 1; $i <= $end; $i++) {
$code .= '|' . $months[$i - 1];
}
@@ -2750,9 +2771,9 @@ class Sieve_Action_Vacation extends Sieve_Action {
*/
function _dayCheck($begin, $end)
{
- $code = 'if header :regex "Received" "^.*(' . str_pad($begin, 2, '0', STR_PAD_LEFT);
+ $code = 'if header :regex "Received" "^.*(' . str_repeat('[0 ]', 2 - strlen($begin)) . $begin;
for ($i = $begin + 1; $i <= $end; $i++) {
- $code .= '|' . str_pad($i, 2, '0', STR_PAD_LEFT);
+ $code .= '|' . str_repeat('[0 ]', 2 - strlen($i)) . $i;
}
return $code
. ') (\\\\(.*\\\\) )?... (\\\\(.*\\\\) )?.... (\\\\(.*\\\\) )?..:..:.. (\\\\(.*\\\\) )?(\\\\+|\\\\-)....( \\\\(.*\\\\))?$" {'
diff --git a/lib/Storage.php b/lib/Storage.php
index 092c490..55f6477 100644
--- a/lib/Storage.php
+++ b/lib/Storage.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Horde: ingo/lib/Storage.php,v 1.43.8.18 2008/02/28 18:40:28 jan Exp $
+ * $Horde: ingo/lib/Storage.php,v 1.43.8.19 2008/07/06 22:46:21 jan Exp $
*
* See the enclosed file LICENSE for license information (ASL). If you
* did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -779,8 +779,8 @@ class Ingo_Storage_spam extends Ingo_Storage_rule {
{
// Attempt to get the default Spam folder from imp
if (in_array('imp', $GLOBALS['registry']->listApps())) {
- $prefs = &Prefs::singleton($GLOBALS['conf']['prefs']['driver'],
- 'imp', Ingo::getUser(), '', null, false);
+ $prefs = Prefs::factory($GLOBALS['conf']['prefs']['driver'],
+ 'imp', Ingo::getUser(), '', null, false);
$prefs->retrieve();
$folder = $prefs->getValue('spam_folder', false);
diff --git a/lib/api.php b/lib/api.php
index c73cc73..f3cd49f 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -5,7 +5,7 @@
* This file defines Ingo's external API interface. Other applications
* can interact with Ingo through this API.
*
- * $Horde: ingo/lib/api.php,v 1.16.12.6 2008/01/07 19:31:46 chuck Exp $
+ * $Horde: ingo/lib/api.php,v 1.16.12.7 2008/08/10 15:54:02 chuck Exp $
*
* See the enclosed file LICENSE for license information (ASL). If you
* did not receive this file, see http://www.horde.org/licenses/asl.php.
@@ -61,6 +61,11 @@ $_services['disableVacation'] = array(
'type' => 'boolean',
);
+/**
+ * Returns a list of available permissions.
+ *
+ * @return array An array describing all available permissions.
+ */
function _ingo_perms()
{
$perms = array();
@@ -74,6 +79,11 @@ function _ingo_perms()
return $perms;
}
+/**
+ * Add addresses to the blacklist
+ *
+ * @param string $addresses The addresses to add
+ */
function _ingo_blacklistFrom($addresses)
{
require_once dirname(__FILE__) . '/../lib/base.php';
@@ -106,6 +116,11 @@ function _ingo_blacklistFrom($addresses)
}
}
+/**
+ * Add addresses to the white list
+ *
+ * @param string $addresses The addresses to add
+ */
function _ingo_whitelistFrom($addresses)
{
require_once dirname(__FILE__) . '/../lib/base.php';
@@ -128,6 +143,11 @@ function _ingo_whitelistFrom($addresses)
}
}
+/**
+ * Can this driver perform on-demand filtering?
+ *
+ * @return boolean True if perform() is available, false if not.
+ */
function _ingo_canApplyFilters()
{
require_once dirname(__FILE__) . '/../lib/base.php';
@@ -140,6 +160,13 @@ function _ingo_canApplyFilters()
}
}
+/**
+ * Perform the filtering specified in the rules.
+ *
+ * @param array $params The parameter array.
+ *
+ * @return boolean True if filtering was performed, false if not.
+ */
function _ingo_applyFilters($params = array())
{
require_once dirname(__FILE__) . '/../lib/base.php';
@@ -153,6 +180,13 @@ function _ingo_applyFilters($params = array())
}
}
+/**
+ * Set vacation
+ *
+ * @param array $info Vacation details
+ *
+ * @return boolean True on success.
+ */
function _ingo_setVacation($info)
{
require_once dirname(__FILE__) . '/../lib/base.php';
@@ -223,6 +257,11 @@ function _ingo_setVacation($info)
return $result;
}
+/**
+ * Disable vacation
+ *
+ * @return boolean True on success.
+ */
function _ingo_disableVacation()
{
require_once dirname(__FILE__) . '/../lib/base.php';
diff --git a/lib/version.php b/lib/version.php
index 19a44f9..ae66e5b 100644
--- a/lib/version.php
+++ b/lib/version.php
@@ -1 +1 @@
-<?php define('INGO_VERSION', 'H3 (1.2)') ?>
+<?php define('INGO_VERSION', 'H3 (1.2.1)') ?>
diff --git a/locale/de_DE/LC_MESSAGES/ingo.mo b/locale/de_DE/LC_MESSAGES/ingo.mo
index 7e4b706..9269c58 100644
Binary files a/locale/de_DE/LC_MESSAGES/ingo.mo and b/locale/de_DE/LC_MESSAGES/ingo.mo differ
diff --git a/locale/et_EE/LC_MESSAGES/ingo.mo b/locale/et_EE/LC_MESSAGES/ingo.mo
index 103b1ab..590c202 100644
Binary files a/locale/et_EE/LC_MESSAGES/ingo.mo and b/locale/et_EE/LC_MESSAGES/ingo.mo differ
diff --git a/locale/eu_ES/LC_MESSAGES/ingo.mo b/locale/eu_ES/LC_MESSAGES/ingo.mo
new file mode 100644
index 0000000..e11407f
Binary files /dev/null and b/locale/eu_ES/LC_MESSAGES/ingo.mo differ
diff --git a/locale/eu_ES/help.xml b/locale/eu_ES/help.xml
new file mode 100644
index 0000000..0e65b8f
--- /dev/null
+++ b/locale/eu_ES/help.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!-- $Horde: ingo/locale/eu_ES/help.xml,v 1.1.2.1 2008/07/17 21:09:26 jan Exp $ -->
+<help><entry id="blacklist" md5="5c12e162f66f68c6c2d84cc7c280d710" state="uptodate">
+ <title>Zerrenda beltza</title>
+ <para>SARRERAKO ONTZIAn ikusi nahi ez dituzun helbide elektronikoen zerrenda bat da zerrenda beltza.</para></entry> <entry id="blacklist-action" md5="1701f4152c090004e3b40205439f9108" state="uptodate">
+ <title>Zerrenda beltza: Ekintza</title>
+ <para>Blokeatutako bidaltzaile batek mezu bat bidaltzen dizunean zer egin behar den definitzen du ekintza honek. Aukerak hauek dituzu: "Ezabatu mezua erabat" edo "Eraman mezuak karpeta honetara:". "Ezabatu mezua erabat" hautatuz gero, mezuak baztertu egingo dira Sarrerako ontzian gorde baino lehen. "Eraman mezuak karpeta honetara:" hautatuz gero, hautatutako karpetara mugituko dira.</para></entry> <entry id="blacklist-addresses" md5="3431e98a8d15bfa645af394cefd8346d" state="uptodate">
+ <title>Zerrenda beltza: Helbideak</title>
+ <para>Blokeatu behar diren helbideen zerrenda da. Lerro batean helbide bakarra idatzi.</para></entry> <entry id="filters_rules" md5="d84617a2f5002d24ef11509e5f4eb6c0" state="uptodate">
+ <title>Arauak: Iragazteko arauak</title>
+ <para>Arauen pantaila nagusia da. Hemendik arau berriak sor ditzakezu "Arau berria" botoian klik eginez; arauen ordena berrantolatu gora eta behera gezien bidez edo "Lekuz aldatu" zutabean posizio-arau berria sartuz; arauak gaitu edo desgaitu "Gaituta" zutabeko ikonoan klik eginez, eta arau zehatzak editatu "Editatu" zutabeko ikonoan edo arauaren izenaren ikonoan klik eginez.</para> <para><tip>Kontuan izan arauak hemen bistaratzen diren ordenan exekutatzen direla. Adibidez, zerrenda beltzak mezu bat ezabatzen badu, hurrengo arauek ez dute inolako eraginik izango mezu horretan.</tip></para></entry> <entry id="forward" md5="c9664b960ceef87cab4af83e8f33412c" state="uptodate">
+ <title>Birbidali</title>
+ <para>Iritsitako mezuak helbide elektroniko batzuetara automatikoki birbidaltzea aukera dezakezu.</para></entry> <entry id="forward-addresses" md5="817c5f002f99c0afd0010aabaf07c91c" state="uptodate">
+ <title>Birbidali: Helbideak</title>
+ <para>Iristen zaizkizun mezuak beste kontu batera birbidaltzea aukera dezakezu. Nahi beste helbide jar ditzakezu. Lerro batean helbide bakarra idatzi.</para></entry> <entry id="forward-keepcopy" md5="be1f36c2f9a8dcba7517b8edf5319d64" state="uptodate">
+ <title>Birbidali: Gorde kopia bat</title>
+ <para>Aukera hau hautatzen baduzu iristen zaizkizun mezuen kopiak kontu horretan gordeko dira, eta era berean, mezu horiek birbidali nahi dituzun helbideetara ere bidaliko dira.</para></entry> <entry id="pref-show_filter_msg" md5="d8795e5b71c6287ed7bfe3f8dc4f4861" state="uptodate">
+ <title>Hobespena: Erakutsi mezu xehatuak iragazkiak aplikatzean?</title>
+ <para>IMAP iragazte-kontrolatzailea erabiliz gero, hobespen honek iragazkien prozesuaren xehetasuna kontrolatzen du. Ezarrita badago, iragazitako mezu guztiak beste berrespen mezu batean egongo dira, mezua prozesatu ondoren. Ez badago ezarrita, iragazkien laburpena egongo da pantailan.</para></entry> <entry id="pref-filter_seen" md5="85687c69db6145d77053a8b6302e5ad2" state="uptodate">
+ <title>Hobespena: Ikusi gabeko mezuak iragazi soilik?</title>
+ <para>IMAP iragazte-kontrolatzaileak arau horiek zure SARRERAKO ONTZIAn noiz aplikatuko dituen identifikatzen du arau honek. Iragazkiak mezu guztietan, ikusi gabe gisa markatuta dauden mezuetan SOILIK edo ikusitako gisa markatutako mezuetan SOILIK aplika ditzakezu.</para></entry> <entry id="rule" md5="cf211ec97956e9adc3b8f01b2a40888f" state="uptodate">
+ <title>Iragazteko araua</title>
+ <para>Arau bat zure posta-iragazkiaren oinarrizko atala da, eta baldintza edo ekintza batean edo gehiagotan oinarritzen da. Mezu bat bidaltzen dizutenean, zure iragazki-arauetako baldintzen bidez prozesatzen da. Zuk zehaztutako baldintzak betetzen badira, zuk zehaztutako ekintzak mezu horretan egingo dira. Iragazkiak erabilgarriak izan daitezke nahi ez dituzun mezuak automatikoki ezabatzeko edo posta-kontua errazago erabiltzeko, mezuak hainbat karpetatan gordez.</para></entry> <entry id="rule-action" md5="0f66574fec21645147b3cbb967cc23b1" state="uptodate">
+ <title>Iragazteko araua: Ekintza</title>
+ <para>Iritsitako mezu bat zehaztutako baldintzekin bat datorrenean, hauek dira egin daitezkeen ekintzak. Kontuan izan ez dituzula aukera hauek guztiak eskuragarri izango - mendeko iragazki-softwarearekin funtzionatzen duten aukerak erakutsiko dira soilik.</para> <heading>Bidali mezu hau SARRERAKO ONTZIra</heading> <para>Mezua zure SARRERAKO ONTZIAn gordeko da. Hau da aukera lehenetsia.</para> <heading>Bidali postontzi honetara</heading> <para>Mezua zehaztutako karpetara bidaliko da.</para> <heading>Baztertu mezu hau</heading> <para>Mezua ezer esan gabe ezabatuko da. Ez zuk, ez bidaltzaileak, ez duzue horren berri izango.</para> <heading>Birbideratu mezua</heading> <para>Mezua zuk zehaztutako helbide elektronikora bidaliko da. Ez da mezuaren kopiarik gordeko kontu honetan.</para> <heading>Bidali SARRERAKO ONTZIra eta birbidali</heading> <para>Mezua zehaztutako helbide elektronikora bidaliko da, eta mezuaren kopia SARRERAKO ONTZIAn gordeko da.</para> <heading>Ezetsi mezu hau arrazoiarekin</heading> <para>Jatorrizko mezua baztertu egingo da, eta mezu berri bat bidaliko diozu bidaltzaileari zuk zehaztutako testuarekin.</para></entry> <entry id="rule-combine" md5="29484c1ebdd7ce71edc34fc8100ef69c" state="uptodate">
+ <title>Iragazteko araua: Konbinatu aukerak</title>
+ <para>Arau batean baldintza asko defini ditzakezu. Logikoki batera taldeka ditzakezu "eta"/"edo" erabiliz. Ezin duzu bi baldintzak dauzkan iragazki konplexurik sortu.</para> <heading>Eta</heading> <para>ETA hautatzen baduzu, iristen den mezu batek zuk zehaztutako baldintza guztiak bete behar ditu, ekintzak exekutatzeko.</para> <heading>Edo</heading> <para>EDO hautatzen baduzu, zehaztutako ekintzak exekutatuko dira, gutxienez, baldintzetako bat betetzen bada.</para></entry> <entry id="rule-mark" md5="e8bdb30d1c1c1cdc5ec1e5e4804f9300" state="uptodate">
+ <title>Iragazteko araua: Markatu mezua</title>
+ <para>Mezu bat IMAP bandera bat baino gehiagorekin markatzea zehatz dezakezu, arau batean ekintza bat baino gehiago egiteko. Aukerak hauek dira: Ikusita, Garrantzitsua, Erantzunda eta Ezabatuta.</para></entry> <entry id="rule-matches" md5="517e24971f2c5443b2ed04e9c504e7eb" state="uptodate">
+ <title>Iragazteko araua: Bat-etortzeak</title>
+ <para>Arau bateko baldintza bakoitzean 3 osagai daude. Lehena aztertu behar den eremua da. Bigarrena egin behar den konparazio mota da. Hirugarrenak eremua zein baliorekin konparatu behar den zehazten du. Konparazio mota batzuk egin daitezke. Edozein eremutako konparazio erabilgarriak eremu motaren eta azpiko iragazki-softwareak maneia dezakeenaren mende daude. Beraz, behean zerrendatuta dauden bat-etortze potentzial guztiak ez dira agertuko eremuan.</para> <heading>Dauka</heading> <para>Egiatzat joko da, zehaztutako katea lerroan zehar, nonbait, aurkitzen bada. Adibidea: erabiltzailea at adibidea bat etor daiteke joe_erabiltzailea at adibidea.com helbidearekin</para> <heading>Ez dauka</heading> <para>Egiatzat joko da zehaztutako katea ez bada lerroan zehar inon aurkitzen. Adibidea: erabiltzailea at adibidea ez dator bat joe_user at adibidea.com helbidearekin</para> <heading>Bada</heading> <para> Egiatzat joko da zehaztutako katea lerroarekin bat badator zehatz-mehatz. Adibidea: erabiltzailea at adibidea.com erabiltzailea at adibidea.com helbidea da</para> <heading>Ez da</heading> <para>Egiatzat joko da zehaztutako katea ez badator bat zehatz-mehatz lerroarekin. Adibidea: erabiltzailea at adibidea ez da erabiltzailea at adibidea.com helbidea</para> <heading>Honela hasten da</heading> <para>Egiatzat joko da zehaztutako katea lerroaren hasierarekin bat etortzen bada. Adibidea: erabiltzailea at adibidea erabiltzailea at adibidea.com helbidearekin bat etorriko da</para> <heading>Ez da honela hasten</heading> <para>Egiatzat joko da zehaztutako katea ez badator bat lerroaren hasierarekin. Adibidea: erabiltzailea at adibidea ez da bat etorriko erabiltzailea at adibidea.com helbidearekin</para> <heading>Honela amaitzen da</heading> <para>Egiatzat joko da zehaztutako katea lerroaren amaierarekin bat datorrenean. Adibidea: adibidea.com bat etorriko da erabiltzailea at adibidea.com helbidearekin</para> <heading>Ez da honela amaitzen</heading> <para>Egiazkotzat joko da zehaztutako katea ez badator bat lerroaren amaierarekin. Adibidea: horde.org ez da bat etorriko erabiltzailea at adibidea.com helbidearekin</para> <heading>Badago</heading> <para>Egiatzat joko da zehaztutako goiburua mezuan badago, zein balio den kontuan hartu gabe.</para> <heading>Ez dago</heading> <para>Egiatzat joko da zehaztutako goiburua mezuan ez badago.</para> <heading>Regex</heading> <para>Regex-en bidez, POSIX adierazpen erregular bateragarri konplexuak erabil ditzakezu mezuaren goiburua hautatzeko. Adibidea: "Bidaltzailea [*\.*\.*\.*] (a-ostalaria|b-ostalaria).adibidea.com*" eta "Bidaltzailea [172.16.100.1] a-ostalaria.adibide.com asteartean" bat etor daitezke</para> <heading>Bat datoz</heading> <para>Bat-etortzea eta edukia antzekoak dira, baina * eta ? komodinak ere erabil ditzakezu. * komodinak edozein karaktere kopururekin bat egiten du eta ? komodinak zehazki karaktere batekin egiten du bat. Adibidea: "*erabiltzailea?@adibidea.com" helbideak "erabiltzailea1 at adibidea.com" eta "bestelakoerabiltzailea2 at adibidea.com" helbideekin bat egingo du.</para> <heading>Ez dator bat</heading> <para>Ez dator bat, bat egitea bezalakoa da; baina kasu honetan faltsura aldatuko da, zehaztutako balioak mezuko goiburuarekin bat egiten badu.</para> <heading>Hau baino gutxiago</heading> <para>Hau proba erlazional bat da, zehaztutako balioa eta mezuko goiburuko balioa zenbakien arabera konparatuko dituena.</para> <heading>Txikiago edo berdin</heading> <para>Hau proba erlazional bat da, zehaztutako balioa eta mezuko goiburuko balioa zenbakien arabera konparatuko dituena.</para> <heading>Berdin</heading> <para>Proba erlazional bat da, zehaztutako balioa eta mezuko goiburuko balioa zenbakien arabera konparatuko dituena.</para> <heading>Hau baino handiagoa edo berdina</heading> <para>Proba erlazional bat da, zehaztutako balioa eta mezuko goiburuko balioa zenbakien arabera konparatuko dituena.</para> <heading>Hau baino handiagoa</heading> <para>Proba erlazional bat da, zehaztutako balioa eta mezuko goiburuko balioa zenbakien arabera konparatuko dituena.</para></entry> <entry id="rule-name" md5="8faaf71e4bf2f91d943d77f803f9a2d5" state="uptodate">
+ <title>Iragazteko araua: Izena</title>
+ <para>Arau baten izen deskriptiboa da. Izen deskriptiboa erabil dezakezu iragazki-zerrendan arau bat identifikatzeko.</para></entry> <entry id="rule-stop" md5="677c920effca959123b7d539b3b0d864" state="uptodate">
+ <title>Iragazteko araua: Utzi egiaztatzeari</title>
+ <para>Aukera hau hautatzen bada, eta mezuren bat arauarekin bat badator, gainerako iragazkiak ez dira prozesatuko.</para></entry> <entry id="vacation" md5="2c9e12973d36fe94aeb73b32db9a64e6" state="uptodate">
+ <title>Kanpoan</title>
+ <para>Kanpoan zaudenean, zuri mezua bidaltzen dizuten pertsonei automatikoki bidaltzen zaizkien mezuak dira. Aldi baterako kanpora joaten zarenean bidaltzen dira.</para></entry> <entry id="vacation-bulk" md5="6f6e4178e80f46e7876c7ee5d0ac53b7" state="uptodate">
+ <title>Kanpoan: Ez erantzun mezu baztergarriei</title>
+ <para>Aukera hau hautatuz gero, posta-zerrendetatik bidalitako edo mezu baztergarri gisa markatutako mezuei ez zaie kanpoan zaudela jakinarazteko mezurik bidaltzen.</para></entry> <entry id="vacation-days" md5="25ba74c0e79ce72237795eb809ee4585" state="uptodate">
+ <title>Kanpoan: Erantzuteko bitartea</title>
+ <para>Mezu bidez kanpoan zaudela jakinarazi diozun helbide elektronikoari, beste mezu bat bidaltzeko zenbat egun pasako diren zehaztea da.</para></entry> <entry id="vacation-myemail" md5="ef3fa70e940ed1472276c0fde5ae2aed" state="uptodate">
+ <title>Kanpoan: Nire helbide elektronikoak</title>
+ <para>Postontzi honetarako helbide elektroniko bat baino gehiago badituzu, zehaztu hemen zein diren.</para></entry> <entry id="vacation-noresponse" md5="2b72e12b6989c9ef1667a59040c70310" state="uptodate">
+ <title>Kanpoan: Erantzunik ez</title>
+ <para>Ez bidali kanpoan nagoela jakinarazteko mezurik hartzaile hauei. Lerro batean helbide elektroniko bakarra jarri.</para></entry> <entry id="vacation-reason" md5="d4da2f3a0d357e00950ec57d984cbcee" state="uptodate">
+ <title>Kanpoan: Kanpoan egoteko arrazoia</title>
+ <para>Hau da kanpoan zaudela jakinarazteko bidaltzen diren mezuetako testua.</para></entry> <entry id="vacation-subject" md5="ce16c7c6a08993821208cfbee0b188a0" state="uptodate">
+ <title>Kanpoan: Kanpoan zaudeneko gaia</title>
+ <para>Hau da kanpoan zaudela jakinarazteko bidaliko diren mezuetako gaia.</para></entry> <entry id="whitelist" md5="ecbf7000f107832d68bd7ba8f5121909" state="uptodate">
+ <title>Zerrenda zuria</title>
+ <para>Zerrenda zuria, zure SARRERAKO ONTZIAn beti ikusi nahi dituzun mezuen helbide elektronikoen zerrenda da. Lerro batean helbide bakarra idatzi.</para></entry> <entry id="whitelist-addresses" md5="8fe054c1b55e6adc81d1d8525c131637" state="uptodate">
+ <title>Zerrenda zuriko helbideak</title>
+ <para>EGITEKO. Lerro batean helbide bakarra idatzi.</para></entry></help>
diff --git a/locale/fi_FI/LC_MESSAGES/ingo.mo b/locale/fi_FI/LC_MESSAGES/ingo.mo
index bcd5eb8..b4a1ee0 100644
Binary files a/locale/fi_FI/LC_MESSAGES/ingo.mo and b/locale/fi_FI/LC_MESSAGES/ingo.mo differ
diff --git a/locale/nl_NL/LC_MESSAGES/ingo.mo b/locale/nl_NL/LC_MESSAGES/ingo.mo
index 93538ec..9bcf72a 100644
Binary files a/locale/nl_NL/LC_MESSAGES/ingo.mo and b/locale/nl_NL/LC_MESSAGES/ingo.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/ingo.mo b/locale/pt_BR/LC_MESSAGES/ingo.mo
index c079e20..22d2f32 100644
Binary files a/locale/pt_BR/LC_MESSAGES/ingo.mo and b/locale/pt_BR/LC_MESSAGES/ingo.mo differ
diff --git a/po/de_DE.po b/po/de_DE.po
index 712de5f..b0cabab 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Ingo 1.2-cvs\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-10 00:39+0200\n"
-"PO-Revision-Date: 2008-05-09 22:50+0200\n"
+"POT-Creation-Date: 2008-09-06 11:10+0200\n"
+"PO-Revision-Date: 2008-07-12 18:48+0200\n"
"Last-Translator: Jan Schneider\n"
"Language-Team: i18n at lists.horde.org\n"
"MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Erweiterte Einstellungen"
msgid "All of the following"
msgstr "Alle der folgenden"
-#: lib/api.php:68
+#: lib/api.php:73
msgid "Allow Rules"
msgstr "Regeln erlauben"
@@ -77,7 +77,7 @@ msgstr "Filterregeln anwenden"
msgid "Are you sure you want to delete this rule?"
msgstr "Sind Sie sicher, dass Sie diese Regel löschen möchten?"
-#: config/prefs.php.dist:33
+#: config/prefs.php.dist:32
msgid "Automatically update the script after each change?"
msgstr "Das Skript nach jeder Änderung automatisch aktualisieren?"
@@ -111,7 +111,7 @@ msgstr "Ausschlussliste Bearbeiten"
msgid "Blacklist is not supported in the current filtering driver."
msgstr "Ausschlusslisten werden vom aktuellen Filtertreiber nicht unterstützt."
-#: lib/Script/procmail.php:219 lib/Script/sieve.php:269
+#: lib/Script/procmail.php:219 lib/Script/sieve.php:276
#: lib/Script/maildrop.php:197
msgid "Blacklisted Addresses"
msgstr "Ausgeschlossene Adressen"
@@ -211,7 +211,7 @@ msgid "Disable %s"
msgstr "%s deaktivieren"
#: spam.php:160 forward.php:99 vacation.php:153
-#: templates/whitelist/whitelist.inc:10 templates/blacklist/blacklist.inc:10
+#: templates/whitelist/whitelist.inc:8 templates/blacklist/blacklist.inc:10
#: templates/rule/header.inc:26
msgid "Disabled"
msgstr "Deaktiviert"
@@ -350,21 +350,21 @@ msgstr "Filterregeln"
msgid "Filter Script Display"
msgstr "Filterskript-Anzeige"
-#: lib/Ingo.php:379
+#: lib/Ingo.php:382
msgid "Filter _Rules"
msgstr "_Filterregeln"
-#: lib/Script/imap.php:348
+#: lib/Script/imap.php:357
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr "Filteraktivität: %s Nachricht(en) wurden zum Ordner \"%s\" kopiert."
-#: lib/Script/imap.php:334
+#: lib/Script/imap.php:338
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr "Filteraktivität: %s Nachricht(en) wurden gelöscht."
-#: lib/Script/imap.php:312
+#: lib/Script/imap.php:314
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr "Filteraktivität: %s Nachricht(en) wurden zum Ordner \"%s\" verschoben."
@@ -376,7 +376,7 @@ msgstr ""
"Filteraktivität: %s Nachricht(en), die der Ausschlussliste entsprachen, "
"wurden gelöscht."
-#: lib/Script/imap.php:345
+#: lib/Script/imap.php:350
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
@@ -385,12 +385,12 @@ msgstr ""
"Filteraktivität: Die Nachricht \"%s\" von \"%s\" wurde zum Ordner \"%s\" "
"kopiert."
-#: lib/Script/imap.php:329
+#: lib/Script/imap.php:332
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr "Filteraktivität: Die Nachricht \"%s\" von \"%s\" wurde gelöscht."
-#: lib/Script/imap.php:306
+#: lib/Script/imap.php:307
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
@@ -420,7 +420,7 @@ msgstr "F
msgid "Forward"
msgstr "Weiterleitung"
-#: lib/Script/sieve.php:222
+#: lib/Script/sieve.php:229
msgid "Forward Keep Action"
msgstr "Weiterleiten und behalten"
@@ -428,7 +428,7 @@ msgstr "Weiterleiten und behalten"
msgid "Forward is not supported in the current filtering driver."
msgstr "Weiterleitungen werden vom aktuellen Filtertreiber nicht unterstützt."
-#: lib/Script/procmail.php:298 lib/Script/sieve.php:232
+#: lib/Script/procmail.php:298 lib/Script/sieve.php:239
#: lib/Script/maildrop.php:246
msgid "Forwards"
msgstr "Weiterleitung"
@@ -441,11 +441,11 @@ msgstr "Weiterleitung Bearbeiten"
msgid "From"
msgstr "Von"
-#: lib/Script/sieve.php:2927
+#: lib/Script/sieve.php:2948
msgid "From:"
msgstr "Von:"
-#: lib/Script/sieve.php:118
+#: lib/Script/sieve.php:123
msgid "Generated by Ingo (http://www.horde.org/ingo/)"
msgstr "Erzeugt von Ingo (http://www.horde.org/ingo/)"
@@ -462,7 +462,7 @@ msgid "Individual rules are not supported in the current filtering driver."
msgstr ""
"Individuelle Regeln werden vom aktuellen Filtertreiber nicht unterstützt."
-#: lib/Script/sieve.php:2521
+#: lib/Script/sieve.php:2542
msgid "Inexistant mailbox specified for message delivery."
msgstr "Nicht vorhandener Ordner für die Nachrichtenauslieferung angegeben."
@@ -513,7 +513,7 @@ msgstr "Vergleichstyp"
msgid "Matches (with placeholders)"
msgstr "Entspricht (mit Platzhaltern)"
-#: lib/api.php:71
+#: lib/api.php:76
msgid "Maximum Number of Rules"
msgstr "Maximale Anzahl an Regeln"
@@ -545,19 +545,19 @@ msgstr ""
"Nachrichten mit einem Spam-Level größer oder gleich diesem Wert werden als "
"Spam behandelt."
-#: lib/Script/sieve.php:2941
+#: lib/Script/sieve.php:2962
msgid "Missing address to notify"
msgstr "Benachrichtigungsadresse fehlt"
-#: lib/Script/sieve.php:2322
+#: lib/Script/sieve.php:2343
msgid "Missing address to redirect message to"
msgstr "Die Adresse, zu der weitergeleitet werden soll, wurde nicht angegeben"
-#: lib/Script/sieve.php:2368
+#: lib/Script/sieve.php:2389
msgid "Missing reason for reject"
msgstr "Der Grund für Ablehnung wurde nicht angegeben"
-#: lib/Script/sieve.php:2671
+#: lib/Script/sieve.php:2692
msgid "Missing reason in vacation."
msgstr "Der Grund für die Abwesenheitsnachricht wurde nicht angegeben"
@@ -582,16 +582,16 @@ msgstr "Meine E-Mail-Adressen:"
msgid "New Rule"
msgstr "Neue Regel"
-#: lib/Ingo.php:230 lib/Ingo.php:232
+#: lib/Ingo.php:233 lib/Ingo.php:235
#, php-format
msgid "No \"%s\" element found in backend configuration."
msgstr "\"%s\" in der Backendkonfiguration nicht angegeben."
-#: lib/Ingo.php:223
+#: lib/Ingo.php:226
msgid "No backend configured for this host"
msgstr "Keine Backendkonfiguration für diesen Host angegeben"
-#: lib/Ingo.php:199
+#: lib/Ingo.php:202
msgid "No backends configured in backends.php"
msgstr "Keine Backends in backends.php konfiguriert"
@@ -600,8 +600,8 @@ msgstr "Keine Backends in backends.php konfiguriert"
msgid "No filters. Click \"%s\" to create a new filter."
msgstr "Keine Filter. Klicken Sie auf \"%s\", um neue Filter anzulegen."
-#: lib/Script/sieve.php:1679 lib/Script/sieve.php:1828
-#: lib/Script/sieve.php:2044
+#: lib/Script/sieve.php:1692 lib/Script/sieve.php:1841
+#: lib/Script/sieve.php:2065
msgid "No headers specified"
msgstr "Keine E-Mail-Köpfe angegeben"
@@ -609,7 +609,7 @@ msgstr "Keine E-Mail-K
msgid "No script generated."
msgstr "Kein Skript erzeugt."
-#: lib/Script/sieve.php:2060 lib/Script/sieve.php:2144
+#: lib/Script/sieve.php:2081 lib/Script/sieve.php:2165
msgid "No strings specified"
msgstr "Keine Texte angegeben"
@@ -629,11 +629,11 @@ msgstr "Anzahl der Tage zwischen den Abwesenheitsnachrichten:"
msgid "Only flag the message"
msgstr "Nachricht nur markieren"
-#: config/prefs.php.dist:19
+#: config/prefs.php.dist:18
msgid "Options about script updating."
msgstr "Einstellungen zur Skript-Aktualisierung"
-#: config/prefs.php.dist:17
+#: config/prefs.php.dist:16
msgid "Other Options"
msgstr "Andere Einstellungen"
@@ -711,7 +711,7 @@ msgstr "Regel aktiviert"
msgid "Rule Name:"
msgstr "Regelname:"
-#: lib/Script/sieve.php:2929
+#: lib/Script/sieve.php:2950
msgid "Rule:"
msgstr "Regel:"
@@ -720,7 +720,7 @@ msgstr "Regel:"
msgid "STARTTLS failed: (%s) %s"
msgstr "STARTTLS fehlgeschlagen: (%s) %s"
-#: lib/Ingo.php:393
+#: lib/Ingo.php:396
msgid "S_pam"
msgstr "Spa_m"
@@ -748,19 +748,19 @@ msgstr "Speichern und Aktivieren"
msgid "Script"
msgstr "Skript"
-#: config/prefs.php.dist:18
+#: config/prefs.php.dist:17
msgid "Script Updating"
msgstr "Skript-Aktualisierung"
-#: lib/Ingo.php:175
+#: lib/Ingo.php:178
msgid "Script not updated."
msgstr "Skript nicht aktualisiert."
-#: lib/Ingo.php:146
+#: lib/Ingo.php:149
msgid "Script successfully activated."
msgstr "Skript erfolgreich aktiviert."
-#: lib/Ingo.php:145
+#: lib/Ingo.php:148
msgid "Script successfully deactivated."
msgstr "Skript erfolgreich deaktiviert."
@@ -813,7 +813,7 @@ msgstr "Gr
msgid "Source (From,Reply-to,etc)"
msgstr "Absender (Von, Antwort-an etc.)"
-#: filters.php:198 lib/Script/sieve.php:425 lib/Script/maildrop.php:301
+#: filters.php:198 lib/Script/sieve.php:438 lib/Script/maildrop.php:301
#: lib/Block/overview.php:105 lib/Block/overview.php:108
msgid "Spam Filter"
msgstr "Spamfilter"
@@ -842,29 +842,29 @@ msgstr "Betreff"
msgid "Subject of vacation message:"
msgstr "Betreff der Abwesenheitsnachricht:"
-#: lib/Script/sieve.php:2928
+#: lib/Script/sieve.php:2949
msgid "Subject:"
msgstr "Betreff:"
-#: lib/api.php:103
+#: lib/api.php:113
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr "Die Adresse \"%s\" wurde zu Ihrer Ausschlussliste hinzugefügt."
-#: lib/api.php:126
+#: lib/api.php:141
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr "Die Adresse \"%s\" wurde zu Ihrer Positivliste hinzugefügt."
-#: lib/Ingo.php:141
+#: lib/Ingo.php:144
msgid "The driver said: "
msgstr "Antwort des Treibers: "
-#: lib/Ingo.php:140
+#: lib/Ingo.php:143
msgid "There was an error activating the script."
msgstr "Beim Aktivieren des Skripts ist ein Fehler aufgetreten."
-#: lib/Ingo.php:139
+#: lib/Ingo.php:142
msgid "There was an error deactivating the script."
msgstr "Beim Deaktivieren des Skripts ist ein Fehler aufgetreten."
@@ -886,7 +886,7 @@ msgid "User header"
msgstr "Benutzerdefinierter Kopfeintrag"
#: filters.php:186 vacation.php:151 lib/Script/procmail.php:278
-#: lib/Script/sieve.php:399 lib/Script/maildrop.php:276
+#: lib/Script/sieve.php:412 lib/Script/maildrop.php:276
#: lib/Block/overview.php:61 lib/Block/overview.php:64
msgid "Vacation"
msgstr "Abwesenheit"
@@ -904,11 +904,11 @@ msgstr ""
msgid "Value"
msgstr "Wert"
-#: templates/whitelist/whitelist.inc:16
+#: templates/whitelist/whitelist.inc:14
msgid "Wh_itelist addresses:"
msgstr "P_ositivgelistete Adressen:"
-#: filters.php:180 templates/whitelist/whitelist.inc:8
+#: filters.php:180 templates/whitelist/whitelist.inc:5
#: lib/Block/overview.php:85 lib/Block/overview.php:88
msgid "Whitelist"
msgstr "Positivliste"
@@ -921,7 +921,7 @@ msgstr "Positivliste Bearbeiten"
msgid "Whitelist is not supported in the current filtering driver."
msgstr "Positivlisten werden vom aktuellen Filtertreiber nicht unterstützt."
-#: lib/Script/procmail.php:246 lib/Script/sieve.php:329
+#: lib/Script/procmail.php:246 lib/Script/sieve.php:336
#: lib/Script/maildrop.php:224
msgid "Whitelisted Addresses"
msgstr "Positivgelistete Adressen"
@@ -966,15 +966,19 @@ msgstr "Sie haben nicht gen
msgid "You do not have permission to edit filter rules."
msgstr "Sie haben nicht genügend Rechte, um Filterregeln zu bearbeiten."
-#: lib/Script/sieve.php:2926
+#: lib/Script/sieve.php:2947
msgid "You have received a new message"
msgstr "Sie haben eine neue Nachricht erhalten"
-#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+#: lib/Script/imap.php:309 lib/Script/imap.php:334 lib/Script/imap.php:352
+msgid "[No Sender]"
+msgstr "[Kein Absender]"
+
+#: lib/Script/imap.php:308 lib/Script/imap.php:333 lib/Script/imap.php:351
msgid "[No Subject]"
msgstr "[Kein Betreff]"
-#: lib/Ingo.php:384
+#: lib/Ingo.php:387
msgid "_Blacklist"
msgstr "_Ausschlussliste"
@@ -986,7 +990,7 @@ msgstr "Nachricht komplett _l
msgid "_Enter each address on a new line:"
msgstr "_Jede Adresse in einer eigenen Zeile eintragen:"
-#: lib/Ingo.php:390
+#: lib/Ingo.php:393
msgid "_Forward"
msgstr "_Weiterleitung"
@@ -994,19 +998,19 @@ msgstr "_Weiterleitung"
msgid "_Move message to folder:"
msgstr "Nachricht in diesen Ordner _verschieben:"
-#: lib/Ingo.php:399
+#: lib/Ingo.php:404
msgid "_Permissions"
msgstr "_Rechte"
-#: lib/Ingo.php:396
+#: lib/Ingo.php:401
msgid "_Script"
msgstr "_Skript"
-#: lib/Ingo.php:387
+#: lib/Ingo.php:390
msgid "_Vacation"
msgstr "A_bwesenheit"
-#: lib/Ingo.php:381
+#: lib/Ingo.php:384
msgid "_Whitelist"
msgstr "_Positivliste"
@@ -1022,10 +1026,6 @@ msgstr "und"
msgid "disabled - click to enable"
msgstr "deaktiviert - zum Aktivieren anklicken"
-#: filters.php:218
-msgid "field"
-msgstr "Feld"
-
#: lib/Block/overview.php:52
msgid "inactive"
msgstr "inaktiv"
@@ -1034,10 +1034,6 @@ msgstr "inaktiv"
msgid "maildrop script generated by Ingo"
msgstr "Von Ingo erzeugtes maildrop Script"
-#: filters.php:218
-msgid "match"
-msgstr "entspricht"
-
#: templates/rule/filter.inc:4
msgid "or"
msgstr "oder"
diff --git a/po/et_EE.po b/po/et_EE.po
index 45b84d1..cf7059e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -1,23 +1,23 @@
# INGO ESTONIAN TRANSLATION
-#
+#
# Toomas Aas <toomas.aas at mail.ee>, 2006
msgid ""
msgstr ""
"Project-Id-Version: Ingo 1.1-cvs\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2006-01-05 14:14+0200\n"
-"PO-Revision-Date: 2006-01-05 12:59+0200\n"
-"Last-Translator: Toomas Aas <toomas.aas at mail.ee>\n"
+"POT-Creation-Date: 2008-05-29 15:49+0300\n"
+"PO-Revision-Date: 2008-07-30 19:05+0200\n"
+"Last-Translator: Alar SIng <alar.sing at err.ee>\n"
"Language-Team: Estonian <i18n at lists.horde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-13\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
-#: filters.php:185
+#: filters.php:223
msgid " and"
msgstr " ja"
-#: filters.php:185
+#: filters.php:223
msgid " or"
msgstr " või"
@@ -29,24 +29,36 @@ msgstr "Tegevus mustas nimekirjas oleva aadressi korral:"
msgid "Activate Script"
msgstr "Aktiveeri skript"
-#: lib/Driver/ldap.php:232
+#: lib/Driver/ldap.php:229
#, php-format
msgid "Activating the script for \"%s\" failed: (%d) %s"
msgstr "\"%s\" skripti aktiveerimine nurjus: (%d) %s"
-#: templates/filters/settings.inc:6
+#: templates/filters/settings.inc:8
msgid "Additional Settings"
msgstr "Lisaseadistus"
+#: forward.php:43
+msgid "Address(es) to forward to:"
+msgstr "Aadress(id), kuhu edastada:"
+
+#: vacation.php:56
+msgid "Addresses to not send responses to:"
+msgstr "Ära saada teadet aadressidele:"
+
+#: vacation.php:50
+msgid "Advanced Settings"
+msgstr "Põhjalikud seadistused"
+
#: templates/rule/header.inc:44
msgid "All of the following"
msgstr "Kõigile järgnevaist"
-#: lib/api.php:54
+#: lib/api.php:68
msgid "Allow Rules"
msgstr "Luba reeglid"
-#: templates/rule/footer.inc:33
+#: templates/rule/footer.inc:34
msgid "Answered"
msgstr "Vastatud"
@@ -54,11 +66,11 @@ msgstr "Vastatud"
msgid "Any of the following"
msgstr "Mõnele järgnevaist"
-#: templates/filters/footer.inc:11
+#: templates/filters/footer.inc:8
msgid "Apply Filters"
msgstr "Rakenda filtreid"
-#: filters.php:214
+#: filters.php:252
msgid "Are you sure you want to delete this rule?"
msgstr "Kas oled kindel, et soovid selle reegli kustutada?"
@@ -66,11 +78,15 @@ msgstr "Kas oled kindel, et soovid selle reegli kustutada?"
msgid "Automatically update the script after each change?"
msgstr "Uuenda skript automaatselt pärast iga muudatust"
+#: vacation.php:41
+msgid "Basic Settings"
+msgstr "Seadistused"
+
#: config/fields.php.dist:47
msgid "Bcc"
msgstr "Pimekoopia"
-#: lib/Storage.php:351
+#: lib/Storage.php:346
msgid "Begins with"
msgstr "Algab"
@@ -79,29 +95,29 @@ msgstr "Algab"
msgid "Bind failed: (%s) %s"
msgstr "Sisenemine nurjus: (%s) %s"
-#: filters.php:144 templates/blacklist/blacklist.inc:7
-#: lib/Block/overview.php:84 lib/Block/overview.php:87
+#: filters.php:174 templates/blacklist/blacklist.inc:7
+#: lib/Block/overview.php:95 lib/Block/overview.php:98
msgid "Blacklist"
msgstr "Must nimekiri"
-#: blacklist.php:100
+#: blacklist.php:104
msgid "Blacklist Edit"
msgstr "Musta nimekirja muutmine"
-#: blacklist.php:17
+#: blacklist.php:19
msgid "Blacklist is not supported in the current filtering driver."
msgstr "See filtridraiver ei võimalda musta nimekirja."
-#: lib/Script/maildrop.php:175 lib/Script/procmail.php:207
-#: lib/Script/sieve.php:244
+#: lib/Script/sieve.php:269 lib/Script/procmail.php:209
+#: lib/Script/maildrop.php:197
msgid "Blacklisted Addresses"
msgstr "Aadressid mustas nimekirjas"
-#: config/fields.php.dist:88
+#: config/fields.php.dist:100
msgid "Body"
msgstr "Sisu"
-#: filters.php:182 rule.php:281
+#: filters.php:220 rule.php:322
msgid "Case Sensitive"
msgstr "Tõstutundlik"
@@ -109,34 +125,39 @@ msgstr "T
msgid "Cc"
msgstr "Koopia"
-#: blacklist.php:69 forward.php:33 rule.php:122 vacation.php:41
-#: whitelist.php:36
+#: forward.php:56 rule.php:141 spam.php:90 whitelist.php:38 blacklist.php:70
+#: vacation.php:81
msgid "Changes saved."
msgstr "Muudatused salvestatud."
-#: lib/Driver/ldap.php:75
+#: lib/Driver/ldap.php:73
msgid "Connection failure"
msgstr "Ühendus nurjus"
-#: lib/Storage.php:347
+#: lib/Storage.php:342
msgid "Contains"
msgstr "Sisaldab"
-#: filters.php:225 filters.php:226
+#: filters.php:263 filters.php:264
#, php-format
msgid "Copy %s"
msgstr "Kopeeri %s"
-#: lib/Storage.php:795
+#: lib/Storage.php:993 lib/Storage/sql.php:621
#, php-format
msgid "Copy of %s"
msgstr "%s koopia"
-#: lib/Ingo.php:52
+#: lib/Template.php:235
+#, php-format
+msgid "Could not save the compiled template file '%s'."
+msgstr "Ei õnnestunud salvestaja ja kompileerida malli faili '%s'."
+
+#: lib/Ingo.php:62
msgid "Create new folder"
msgstr "Loo uus kaust"
-#: lib/Script/maildrop.php:279 lib/Script/procmail.php:336
+#: lib/Script/procmail.php:342 lib/Script/maildrop.php:362
msgid "DISABLED: "
msgstr "VÄLJA LÜLITATUD:"
@@ -144,146 +165,169 @@ msgstr "V
msgid "Deactivate Script"
msgstr "Deaktiveeri skript"
-#: filters.php:214 filters.php:215
+#: filters.php:252 filters.php:253
#, php-format
msgid "Delete %s"
msgstr "Kustuta %s"
-#: templates/rule/filter.inc:30
+#: templates/rule/filter.inc:33
msgid "Delete Condition"
msgstr "Kustuta tingimus"
-#: lib/Storage.php:295
+#: lib/Storage.php:290
msgid "Delete message completely"
msgstr "Kustuta kiri tervenisti"
-#: templates/rule/footer.inc:35
+#: templates/rule/footer.inc:36
msgid "Deleted"
msgstr "Kustutatud"
-#: lib/Storage.php:283
+#: lib/Storage.php:278
msgid "Deliver into my Inbox"
msgstr "Pane kiri minu INBOXi"
-#: lib/Storage.php:309
+#: lib/Storage.php:304
msgid "Deliver into my Inbox and copy to"
msgstr "Pane kiri minu INBOXi ja kopeeri kausta"
-#: lib/Storage.php:304
+#: lib/Storage.php:299
msgid "Deliver into my Inbox and redirect to"
msgstr "Pane kiri minu INBOXi ja saada aadressile"
-#: lib/Storage.php:289
+#: lib/Storage.php:284
msgid "Deliver to folder"
msgstr "Pane kiri kausta"
-#: filters.php:241 filters.php:242
+#: config/fields.php.dist:83
+msgid "Destination (To,Cc,Bcc,etc)"
+msgstr "Siht (Kellele, Koopja, jne)"
+
+#: filters.php:277 filters.php:278
#, php-format
msgid "Disable %s"
msgstr "Lülita välja %s"
-#: templates/whitelist/whitelist.inc:10 templates/vacation/vacation.inc:6
-#: templates/rule/header.inc:26 templates/forward/forward.inc:10
-#: templates/blacklist/blacklist.inc:10
+#: forward.php:99 spam.php:149 vacation.php:153 templates/rule/header.inc:26
+#: templates/whitelist/whitelist.inc:10 templates/blacklist/blacklist.inc:10
msgid "Disabled"
msgstr "Välja lülitatud"
-#: templates/filters/settings.inc:13
+#: templates/filters/settings.inc:15
msgid "Display detailed notification when each filter is applied?"
msgstr "Näita iga reegli rakendamisel üksikasjalikku teadet"
-#: templates/vacation/vacation.inc:34
-msgid "Do _not send responses to bulk or list messages"
-msgstr "Ära saada vastuseid listidest tulnud kirjadele"
+#: vacation.php:58
+msgid "Do not send responses to bulk or list messages?"
+msgstr "Ära saada vastuseid listidest tulnud kirjadele?"
#: templates/rule/footer.inc:10
msgid "Do this:"
msgstr "Tee nii:"
-#: lib/Storage.php:352
+#: lib/Storage.php:347
msgid "Doesn't begin with"
msgstr "Ei alga"
-#: lib/Storage.php:348
+#: lib/Storage.php:343
msgid "Doesn't contain"
msgstr "Ei sisalda"
-#: lib/Storage.php:354
+#: lib/Storage.php:349
msgid "Doesn't end with"
msgstr "Ei lõpe"
-#: lib/Storage.php:356
+#: lib/Storage.php:351
msgid "Doesn't exist"
msgstr "Pole olemas"
-#: lib/Storage.php:359
+#: lib/Storage.php:354
msgid "Doesn't match (with placeholders)"
msgstr "Ei vasta tingimusele (koos muutujatega)"
-#: templates/filters/header.inc:31 lib/Block/overview.php:58
-#: lib/Block/overview.php:65 lib/Block/overview.php:78
-#: lib/Block/overview.php:86
+#: templates/filters/header.inc:26 lib/Block/overview.php:63
+#: lib/Block/overview.php:72 lib/Block/overview.php:87
+#: lib/Block/overview.php:97 lib/Block/overview.php:107
msgid "Edit"
msgstr "Muuda"
-#: filters.php:203 filters.php:205 filters.php:209 filters.php:210
+#: filters.php:241 filters.php:243 filters.php:247 filters.php:248
#, php-format
msgid "Edit %s"
msgstr "Muuda %s"
-#: filters.php:245 filters.php:246
+#: filters.php:287 filters.php:288
#, php-format
msgid "Enable %s"
msgstr "Lülita sisse %s"
-#: templates/filters/header.inc:37
+#: templates/filters/header.inc:28
msgid "Enabled"
msgstr "Toimib"
-#: lib/Storage.php:353
+#: vacation.php:45
+msgid "End of vacation:"
+msgstr "Äraoleku lõpp:"
+
+#: lib/Storage.php:348
msgid "Ends with"
msgstr "Lõpeb"
-#: lib/Storage.php:364
+#: lib/Storage.php:359
msgid "Equal to"
msgstr "Võrdub"
-#: lib/Driver/ldap.php:139 lib/Driver/ldap.php:149 lib/Driver/ldap.php:158
-#: lib/Driver/ldap.php:168
+#: lib/Driver/ldap.php:138 lib/Driver/ldap.php:148 lib/Driver/ldap.php:157
+#: lib/Driver/ldap.php:167
#, php-format
msgid "Error retrieving current script: (%d) %s"
msgstr "Viga aktiivse skripti laadimisel: (%d) %s"
-#: blacklist.php:67
+#: blacklist.php:68
msgid "Error saving changes."
msgstr "Viga muudatuste salvestamisel."
-#: templates/filters/header.inc:22
+#: templates/filters/header.inc:20
msgid "Existing Rules"
msgstr "Olemasolevad reeglid"
-#: lib/Storage.php:355
+#: lib/Storage.php:350
msgid "Exists"
msgstr "On olemas"
-#: lib/Driver/ldap.php:144
+#: lib/Driver/ldap.php:143
#, php-format
msgid "Expected 1 object, got %d."
msgstr "Oodati 1 objekti, aga on %d."
-#: templates/filters/settings.inc:20
+#: lib/Driver/sivtest.php:204
+msgid "Failed to read from socket: "
+msgstr "Ebaõnnestus lugeda soklist:"
+
+#: lib/Driver/sivtest.php:199
+msgid "Failed to write to socket: "
+msgstr "Ebaõnnestus kirjutada soklisse:"
+
+#: lib/Driver/sivtest.php:194
+msgid "Failed to write to socket: (connection lost!)"
+msgstr "Ebaõnnestus kirjutada soklisse: (ühendus katkes!)"
+
+#: templates/rule/filter.inc:10
+msgid "Field"
+msgstr "Väli"
+
+#: templates/filters/settings.inc:22
msgid "Filter All Messages"
msgstr "Filtreeri kõik kirjad"
-#: templates/filters/settings.inc:22
+#: templates/filters/settings.inc:24
msgid "Filter Only Seen Messages"
msgstr "Filtreeri ainult loetud kirjad"
-#: templates/filters/settings.inc:21
+#: templates/filters/settings.inc:23
msgid "Filter Only Unseen Messages"
msgstr "Filtreeri ainult lugemata kirjad"
-#: templates/filters/settings.inc:18
+#: templates/filters/settings.inc:20
msgid "Filter Options"
msgstr "Filtreerimise seadistus"
@@ -291,80 +335,92 @@ msgstr "Filtreerimise seadistus"
msgid "Filter Rule"
msgstr "Filtreerimisreegel"
-#: filters.php:109
-msgid "Filtreerimisreeglid"
-msgstr "Suodatinsäännöt"
+#: filters.php:139
+msgid "Filter Rules"
+msgstr "Filtreerimis reeglid"
-#: script.php:52
+#: script.php:54
msgid "Filter Script Display"
msgstr "Filtreerimisskripti esitus"
-#: lib/Ingo.php:311
+#: lib/Ingo.php:379
msgid "Filter _Rules"
msgstr "Filtreerimis_reeglid"
-#: lib/Script/imap.php:318
+#: lib/Script/imap.php:348
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr "Filtreerimine: %s kirja kopeeritud kausta \"%s\"."
-#: lib/Script/imap.php:305
+#: lib/Script/imap.php:334
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr "Filtreerimine: %s kirja kustutatud."
-#: lib/Script/imap.php:283
+#: lib/Script/imap.php:312
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr "Filtreerimine: %s kirja tõstetud kausta \"%s\"."
-#: lib/Script/imap.php:186
+#: lib/Script/imap.php:206
#, php-format
msgid "Filter activity: %s message(s) that matched the blacklist were deleted."
msgstr "Filtreerimine: %s kirja kustutatud musta nimekirja alusel."
-#: lib/Script/imap.php:315
+#: lib/Script/imap.php:345
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
"folder \"%s\"."
msgstr "Filtreerimine: Kiri \"%s\" aadressilt \"%s\" kopeeritud kausta \"%s\"."
-#: lib/Script/imap.php:300
+#: lib/Script/imap.php:329
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr "Filtreerimine: Kiri \"%s\" aadressilt \"%s\" kustutatud."
-#: lib/Script/imap.php:277
+#: lib/Script/imap.php:306
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
"\"%s\"."
msgstr "Filtreerimine: Kiri \"%s\" aadressilt \"%s\" tõstetud kausta \"%s\"."
-#: rule.php:160
+#: rule.php:188
msgid "Filter not found."
msgstr "Filtrit ei leitud."
+#: templates/rule/footer.inc:32
+msgid "Flagged For Followup"
+msgstr "Lipustatud järgnevuseks"
+
+#: spam.php:74
+msgid "Folder to receive spam:"
+msgstr "Kaust kuhu SPAM tuleb:"
+
#: templates/rule/header.inc:42
msgid "For an incoming message that matches:"
msgstr "Saabuva kirjaga, mis vastab:"
-#: filters.php:162 templates/forward/forward.inc:8 lib/Block/overview.php:64
-#: lib/Block/overview.php:66
+#: forward.php:97 filters.php:192 lib/Block/overview.php:71
+#: lib/Block/overview.php:73
msgid "Forward"
msgstr "Edastus"
-#: forward.php:16
+#: lib/Script/sieve.php:222
+msgid "Forward Keep Action"
+msgstr "Edastamise tegevus"
+
+#: forward.php:18
msgid "Forward is not supported in the current filtering driver."
msgstr "Kasutatav filtridraiver ei võimalda edastamist."
-#: lib/Script/maildrop.php:224 lib/Script/procmail.php:282
-#: lib/Script/sieve.php:214
+#: lib/Script/sieve.php:232 lib/Script/procmail.php:288
+#: lib/Script/maildrop.php:246
msgid "Forwards"
msgstr "Edastused"
-#: forward.php:46
+#: forward.php:104
msgid "Forwards Edit"
msgstr "Edastuste muutmine"
@@ -372,44 +428,52 @@ msgstr "Edastuste muutmine"
msgid "From"
msgstr "Kellelt"
-#: lib/Storage.php:362
+#: lib/Script/sieve.php:2927
+msgid "From:"
+msgstr "Kellelt:"
+
+#: lib/Script/sieve.php:118
+msgid "Generated by Ingo (http://www.horde.org/ingo/)"
+msgstr "Tehtud Ingo (http://www.horde.org/ingo/) poolt"
+
+#: lib/Storage.php:357
msgid "Greater than"
msgstr "Suurem kui"
-#: lib/Storage.php:363
+#: lib/Storage.php:358
msgid "Greater than or equal to"
msgstr "Suurem või võrdne"
-#: templates/rule/footer.inc:31
-msgid "Important"
-msgstr "Tähtis"
-
-#: rule.php:36
+#: rule.php:38
msgid "Individual rules are not supported in the current filtering driver."
msgstr "Kasutatav filtridraiver ei võimalda üksikuid reegleid."
-#: lib/Script/sieve.php:1860
+#: lib/Script/sieve.php:2521
msgid "Inexistant mailbox specified for message delivery."
msgstr "Püüad panna kirju olematusse kausta."
-#: lib/Storage.php:349
+#: lib/Storage.php:344
msgid "Is"
msgstr "On"
-#: lib/Storage.php:350
+#: lib/Storage.php:345
msgid "Isn't"
msgstr "Ei ole"
+#: forward.php:41
+msgid "Keep a copy of messages in this account?"
+msgstr "Jäta kirja koopia oma postkasti"
+
#: lib/Driver/ldap.php:23
msgid ""
"LDAP support is required but the LDAP module is not available or not loaded."
msgstr "Vajalik on LDAP toetus, kuid LDAP moodul puudub või pole laetud."
-#: lib/Storage.php:360
+#: lib/Storage.php:355
msgid "Less than"
msgstr "Väiksem kui"
-#: lib/Storage.php:361
+#: lib/Storage.php:356
msgid "Less than or equal to"
msgstr "Väiksem või võrdne"
@@ -421,19 +485,23 @@ msgstr "List-ID"
msgid "Mar_k message as deleted"
msgstr "Mär_gi kiri kustutatuks"
-#: templates/rule/footer.inc:24
+#: templates/rule/footer.inc:25
msgid "Mark message as:"
msgstr "Märgi kiri:"
-#: lib/Storage.php:358
+#: templates/rule/filter.inc:23
+msgid "Match type"
+msgstr "Vastavus tüüp"
+
+#: lib/Storage.php:353
msgid "Matches (with placeholders)"
msgstr "Vastab (koos muutujatega)"
-#: lib/api.php:57
+#: lib/api.php:71
msgid "Maximum Number of Rules"
msgstr "Reeglite suurim arv"
-#: lib/Storage.php:485
+#: lib/Storage.php:507
#, php-format
msgid ""
"Maximum number of blacklisted addresses exceeded (Total addresses: %s, "
@@ -442,7 +510,7 @@ msgstr ""
"Musta nimekirja suuruse piirang ületatud (Aadresse kokku: %s, piirang %s). "
"Rohkem aadresse ei saanud lisada."
-#: lib/Storage.php:538
+#: lib/Storage.php:560
#, php-format
msgid ""
"Maximum number of whitelisted addresses exceeded (Total addresses: %s, "
@@ -451,53 +519,61 @@ msgstr ""
"Valge nimekirja suuruse piirang ületatud (Aadresse kokku: %s, piirang %s). "
"Rohkem aadresse ei saanud lisada."
-#: lib/Script/sieve.php:2075
+#: spam.php:71
+msgid ""
+"Messages with a likely spam score greater than or equal to this number will "
+"be treated as spam."
+msgstr ""
+"Kiri oletava spami tunnustega rohkem või sama selle numbriga koheldakse kui "
+"spami."
+
+#: lib/Script/sieve.php:2941
msgid "Missing address to notify"
msgstr "Teavituse aadress puudub"
-#: lib/Script/sieve.php:1728
+#: lib/Script/sieve.php:2322
msgid "Missing address to redirect message to"
msgstr "Edastamise aadress puudub"
-#: lib/Script/sieve.php:1760
+#: lib/Script/sieve.php:2368
msgid "Missing reason for reject"
msgstr "Puudub tagasilükkamise põhjus"
-#: lib/Script/sieve.php:1927
+#: lib/Script/sieve.php:2671
msgid "Missing reason in vacation."
msgstr "Äraoleku põhjendus puudub."
-#: templates/filters/header.inc:40
+#: templates/filters/header.inc:32
msgid "Move"
msgstr "Järjesta"
-#: filters.php:126 filters.php:238
+#: filters.php:156 filters.php:273
msgid "Move Rule Down"
msgstr "Nihuta reeglit allapoole"
-#: filters.php:127 filters.php:237
+#: filters.php:157 filters.php:272
msgid "Move Rule Up"
msgstr "Nihuta reeglit ülespoole"
-#: templates/vacation/vacation.inc:42
-msgid "N_umber of days between vacation replies:"
-msgstr "Päe_vade arv äraolekuteadete vahel:"
+#: vacation.php:53
+msgid "My email addresses:"
+msgstr "Minu e-posti aadressid:"
-#: templates/filters/filter-none.inc:3 templates/filters/footer.inc:8
-#: lib/Storage.php:746
+#: templates/filters/filter-none.inc:3 templates/filters/footer.inc:6
+#: lib/Storage.php:889
msgid "New Rule"
msgstr "Uus reegel"
-#: lib/Ingo.php:205 lib/Ingo.php:207
+#: lib/Ingo.php:230 lib/Ingo.php:232
#, php-format
msgid "No \"%s\" element found in backend configuration."
msgstr "Alusrakenduse seadistuses ei leitud elementi \"%s\"."
-#: lib/Ingo.php:203
+#: lib/Ingo.php:223
msgid "No backend configured for this host"
msgstr "Alusrakendus ei ole sellel serveril seadistatud"
-#: lib/Ingo.php:180
+#: lib/Ingo.php:199
msgid "No backends configured in backends.php"
msgstr "Failis backends.php pole ühtki alusrakendust seadistatud"
@@ -506,31 +582,32 @@ msgstr "Failis backends.php pole
msgid "No filters. Click \"%s\" to create a new filter."
msgstr "Reegleid ei ole. Uue reegli loomiseks klõpsa \"%s\"."
-#: lib/Script/sieve.php:1332 lib/Script/sieve.php:1425
-#: lib/Script/sieve.php:1599
+#: lib/Script/sieve.php:1679 lib/Script/sieve.php:1828
+#: lib/Script/sieve.php:2044
msgid "No headers specified"
msgstr "Päiseid pole määratud"
-#: script.php:67
+#: script.php:69
msgid "No script generated."
msgstr "Skripti ei loodud."
-#: lib/Script/sieve.php:1614
+#: lib/Script/sieve.php:2060 lib/Script/sieve.php:2144
msgid "No strings specified"
msgstr "Sõnu pole määratud"
-#: lib/Storage.php:365
+#: lib/Storage.php:360
msgid "Not equal to"
-msgstr "erineb"
-
-#: lib/Storage.php:325
-msgid "Notify"
-msgstr "Teavitus"
+msgstr "Erineb"
+#: lib/Storage.php:320
msgid "Notify email address"
msgstr "Saada teavitus aadressile"
-#: lib/Storage.php:319
+#: vacation.php:60
+msgid "Number of days between vacation replies:"
+msgstr "Päe_vade arv äraolekuteadete vahel:"
+
+#: lib/Storage.php:314
msgid "Only flag the message"
msgstr "Muuda ainult kirja atribuute"
@@ -546,86 +623,108 @@ msgstr "Muud seaded"
msgid "Overview"
msgstr "Ülevaade"
-#: templates/javascript/new_folder.js:6
+#: config/fields.php.dist:91
+msgid "Participant (From,To,etc)"
+msgstr "Osavõtjad (Kellelt, Kellele, jne)"
+
+#: templates/javascript/new_folder.js:7
msgid "Please enter the name of the new folder:"
msgstr "Sisesta uue kausta nimi:"
-#: templates/vacation/vacation.inc:60
-msgid "R_eason"
-msgstr "Põ_hjus"
+#: vacation.php:48
+msgid "Reason:"
+msgstr "Põhjus"
#: config/fields.php.dist:63
msgid "Received"
msgstr "Saabunud"
-#: lib/Storage.php:300
+#: lib/Storage.php:295
msgid "Redirect to"
msgstr "Edasta aadressile"
-#: lib/Storage.php:357
+#: lib/Storage.php:352
msgid "Regular expression"
msgstr "Regulaaravaldis"
-#: lib/Storage.php:315
+#: lib/Storage.php:310
msgid "Reject with reason"
msgstr "Lükka tagasi põhjusega"
-#: config/fields.php.dist:55
-msgid "Resent-to"
-msgstr "Edasi saadetud aadressile"
-
#: config/fields.php.dist:51
-msgid "Resent-from"
-msgstr "Resent-from"
+msgid "Resent-From"
+msgstr "Saada uuesti Kellelt"
+
+#: config/fields.php.dist:55
+msgid "Resent-To"
+msgstr "Saada uuesti kellele"
-#: templates/rule/footer.inc:60
+#: templates/rule/footer.inc:61
msgid "Return to Filters List"
msgstr "Tagasi filtrite nimekirja"
-#: templates/whitelist/whitelist.inc:24 templates/vacation/vacation.inc:71
-#: templates/forward/forward.inc:34 templates/blacklist/blacklist.inc:41
+#: forward.php:34 forward.php:88 spam.php:62 spam.php:130 vacation.php:34
+#: vacation.php:117 templates/whitelist/whitelist.inc:24
+#: templates/blacklist/blacklist.inc:42
msgid "Return to Rules List"
msgstr "Tagasi reeglite nimekirja"
-#: templates/filters/header.inc:34
+#: templates/filters/header.inc:27
msgid "Rule"
msgstr "Reegel"
-#: filters.php:60
+#: filters.php:78
msgid "Rule Copied"
msgstr "Reegel kopeeritud"
-#: filters.php:39
+#: filters.php:57
msgid "Rule Deleted"
msgstr "Reegel kustutatud"
-#: filters.php:76
+#: forward.php:72 filters.php:94 spam.php:106 vacation.php:97
msgid "Rule Disabled"
msgstr "Reegel välja lülitatud"
-#: filters.php:81
+#: forward.php:63 filters.php:99 spam.php:97 vacation.php:88
msgid "Rule Enabled"
msgstr "Reegel sisse lülitatud"
#: templates/rule/header.inc:33
-msgid "Rule Name"
-msgstr "Reegli nimi"
+msgid "Rule Name:"
+msgstr "Reegli nimi:"
-#: lib/Driver/ldap.php:88
+#: lib/Script/sieve.php:2929
+msgid "Rule:"
+msgstr "Reegel:"
+
+#: lib/Driver/ldap.php:86
#, php-format
msgid "STARTTLS failed: (%s) %s"
msgstr "STARTTLS nurjus: (%s) %s"
-#: templates/whitelist/whitelist.inc:23 templates/vacation/vacation.inc:70
-#: templates/rule/footer.inc:59 templates/forward/forward.inc:33
-#: templates/blacklist/blacklist.inc:40
+#: lib/Ingo.php:393
+msgid "S_pam"
+msgstr "Spam"
+
+#: forward.php:45 spam.php:79 vacation.php:62 templates/rule/footer.inc:60
+#: templates/whitelist/whitelist.inc:23 templates/blacklist/blacklist.inc:41
msgid "Save"
msgstr "Salvesta"
-#: templates/filters/settings.inc:29
+#: templates/filters/settings.inc:31
msgid "Save Settings"
msgstr "Salvesta seadistus"
+#: forward.php:66 forward.php:84 spam.php:100 spam.php:126 vacation.php:91
+#: vacation.php:113
+msgid "Save and Disable"
+msgstr "Salvesta ja Lülita välja"
+
+#: forward.php:57 forward.php:86 spam.php:91 spam.php:128 vacation.php:82
+#: vacation.php:115
+msgid "Save and Enable"
+msgstr "Salvesta ja Aktiveeri"
+
#: templates/script/header.inc:2
msgid "Script"
msgstr "Skript"
@@ -634,31 +733,35 @@ msgstr "Skript"
msgid "Script Updating"
msgstr "Skripti uuendamine"
-#: lib/Ingo.php:228
+#: lib/Ingo.php:175
msgid "Script not updated."
msgstr "Skripti ei muudetud."
-#: lib/Ingo.php:130
+#: lib/Ingo.php:146
msgid "Script successfully activated."
msgstr "Skripti aktiveerimine õnnestus."
-#: lib/Ingo.php:129
+#: lib/Ingo.php:145
msgid "Script successfully deactivated."
msgstr "Skripti deaktiveerimine õnnestus."
-#: templates/rule/footer.inc:29
+#: templates/rule/footer.inc:30
msgid "Seen"
msgstr "Loetud"
-#: rule.php:190
+#: rule.php:218
msgid "Select a field"
msgstr "Vali väli"
-#: lib/Ingo.php:49
+#: templates/menu.inc:6 templates/menu.inc:8
+msgid "Select ruleset to display:"
+msgstr "Vali reeglid mida näidata:"
+
+#: rule.php:347 templates/blacklist/blacklist.inc:23 lib/Ingo.php:59
msgid "Select target folder"
msgstr "Vali sihtkaust"
-#: rule.php:227
+#: rule.php:255
msgid "Self-Defined Header"
msgstr "Muu päis"
@@ -666,7 +769,7 @@ msgstr "Muu p
msgid "Sender"
msgstr "Saatja"
-#: filters.php:95
+#: filters.php:118
msgid "Settings successfully updated."
msgstr "Seadistus muudetud."
@@ -678,41 +781,70 @@ msgstr "N
msgid "Show Current Script"
msgstr "Näita kehtivat skripti"
-#: config/fields.php.dist:83
+#: spam.php:18
+msgid "Simple spam filtering is not supported in the current filtering driver."
+msgstr "Spami eemaldamine ei ole toeatud hetkege reegli draiveri poolt."
+
+#: config/fields.php.dist:95
msgid "Size"
msgstr "Suurus"
-#: templates/rule/footer.inc:49
+#: config/fields.php.dist:87
+msgid "Source (From,Reply-to,etc)"
+msgstr "Lähe (Kelletl, Vastus, jne)"
+
+#: filters.php:198 lib/Block/overview.php:105 lib/Block/overview.php:108
+#: lib/Script/sieve.php:425 lib/Script/maildrop.php:301
+msgid "Spam Filter"
+msgstr "Spami filter"
+
+#: spam.php:147 spam.php:154
+msgid "Spam Filtering"
+msgstr "Spami filtrid"
+
+#: spam.php:71
+msgid "Spam Level:"
+msgstr "Spami Level:"
+
+#: vacation.php:43
+msgid "Start of vacation:"
+msgstr "Äraoleku algus:"
+
+#: templates/rule/footer.inc:50
msgid "Stop checking if this rule matches?"
msgstr "Kui vastab sellele reeglile, katkesta kontroll"
-#: templates/vacation/vacation.inc:51
-msgid "Subje_ct of vacation message:"
-msgstr "Äraolekuteate _teema:"
-
#: config/fields.php.dist:31
msgid "Subject"
msgstr "Teema"
-#: lib/api.php:85
+#: vacation.php:46
+msgid "Subject of vacation message:"
+msgstr "Äraolekuteate teema:"
+
+#: lib/Script/sieve.php:2928
+msgid "Subject:"
+msgstr "Teema:"
+
+#: lib/api.php:103
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr "Aadress \"%s\" lisati musta nimekirja."
-#: lib/api.php:104
+#: lib/api.php:126
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr "Aadress \"%s\" lisati valgesse nimekirja."
-#: lib/Ingo.php:125
+#: lib/Ingo.php:141
msgid "The driver said: "
msgstr "Draiver ütles: "
-#: lib/Ingo.php:124
+#: lib/Ingo.php:140
msgid "There was an error activating the script."
msgstr "Skripti aktiveerimisel tekkis viga."
-#: lib/Ingo.php:123
+#: lib/Ingo.php:139
msgid "There was an error deactivating the script."
msgstr "Skripti deaktiveerimisel tekkis viga."
@@ -720,48 +852,56 @@ msgstr "Skripti deaktiveerimisel tekkis viga."
msgid "To"
msgstr "Kellele"
-#: templates/filters/filter.html:28
+#: templates/filters/filter.html:32
msgid "To:"
msgstr "Kellele:"
-#: lib/Script.php:127
+#: lib/Script.php:126
#, php-format
msgid "Unable to load the definition of %s."
msgstr "%s kirjelduse laadimine nurjus."
-#: filters.php:156 templates/vacation/vacation.inc:5
-#: lib/Script/procmail.php:262 lib/Script/sieve.php:352
-#: lib/Block/overview.php:57 lib/Block/overview.php:59
+#: templates/rule/filter.inc:15
+msgid "User header"
+msgstr "Kasutaja päis"
+
+#: filters.php:186 vacation.php:151 lib/Block/overview.php:61
+#: lib/Block/overview.php:64 lib/Script/sieve.php:399
+#: lib/Script/procmail.php:268 lib/Script/maildrop.php:276
msgid "Vacation"
msgstr "Äraolek"
-#: vacation.php:72
+#: vacation.php:158
msgid "Vacation Edit"
msgstr "Äraolekuteate muutmine"
-#: vacation.php:16
+#: vacation.php:18
msgid "Vacation is not supported in the current filtering driver."
msgstr "Kasutatav filtreerimisdraiver ei võimalda äraolekuteadet."
+#: rule.php:353
+msgid "Value"
+msgstr "Väärtus"
+
#: templates/whitelist/whitelist.inc:16
msgid "Wh_itelist addresses:"
-msgstr "Aadressid _valges nimekirjas:"
+msgstr "Aadressid valges nimekirjas:"
-#: filters.php:150 templates/whitelist/whitelist.inc:8
-#: lib/Block/overview.php:76 lib/Block/overview.php:79
+#: filters.php:180 templates/whitelist/whitelist.inc:8
+#: lib/Block/overview.php:85 lib/Block/overview.php:88
msgid "Whitelist"
-msgstr "Valge nimekiri"
+msgstr "Valgenimekiri"
-#: whitelist.php:55
+#: whitelist.php:57
msgid "Whitelist Edit"
msgstr "Valge nimekirja muutmine"
-#: whitelist.php:18
+#: whitelist.php:20
msgid "Whitelist is not supported in the current filtering driver."
msgstr "Kasutatav filtreerimisdraiver ei võimalda valget nimekirja."
-#: lib/Script/maildrop.php:202 lib/Script/procmail.php:234
-#: lib/Script/sieve.php:298
+#: lib/Script/sieve.php:329 lib/Script/procmail.php:236
+#: lib/Script/maildrop.php:224
msgid "Whitelisted Addresses"
msgstr "Aadressid valges nimekirjas"
@@ -781,75 +921,73 @@ msgstr "X-Spam-Score"
msgid "X-Spam-Status"
msgstr "X-Spam-Status"
-#: filters.php:53 rule.php:144
+#: filters.php:71 rule.php:172
#, php-format
msgid "You are not allowed to create more than %d rules."
msgstr "Sa ei saa luua rohkem kui %d reeglit."
-#: filters.php:45 rule.php:21
+#: filters.php:63 rule.php:23
msgid "You are not allowed to create or edit custom rules."
msgstr "Sa ei saa luua või muuta kohandatud reegleid."
-#: vacation.php:30
-msgid ""
-"You must specify at least one email address for which the vacation messages "
-"should be activated."
-msgstr ""
-"Pead määrama vähemalt ühe aadressi, mille jaoks äraolekuteated aktiveerida."
+#: rule.php:96
+#, php-format
+msgid "You cannot create empty conditions. Please fill in a value for \"%s\"."
+msgstr "Ei saa tekkitada tühja vastet. Palun täida väärtus \"%s\"."
-#: lib/Script/imap.php:278 lib/Script/imap.php:301 lib/Script/imap.php:315
-msgid "[No Subject]"
-msgstr "[Teema puudub]"
+#: filters.php:52 rule.php:151
+msgid "You do not have permission to delete filter rules."
+msgstr "Sul puuduvad õigused filtrite kustutamiseks."
+
+#: filters.php:45 filters.php:112 filters.php:123 rule.php:58 rule.php:165
+msgid "You do not have permission to edit filter rules."
+msgstr "Sul puuduvad õigused filtrite muutmiseks"
-#: templates/forward/forward.inc:24
-msgid "_Address(es) to forward to:"
-msgstr "_Aadressid, kuhu edastada:"
+#: lib/Script/sieve.php:2926
+msgid "You have received a new message"
+msgstr "Sulle on uus kiri"
-#: templates/vacation/vacation.inc:23
-msgid "_Addresses to not send responses to:"
-msgstr "Ära _saada teadet aadressidele:"
+#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+msgid "[No Subject]"
+msgstr "[Teema puudub]"
-#: lib/Ingo.php:316
+#: lib/Ingo.php:384
msgid "_Blacklist"
-msgstr "_Must nimekiri"
+msgstr "_Mustnimekiri"
#: templates/blacklist/blacklist.inc:18
msgid "_Delete message completely"
msgstr "_Kustuta kiri tervenisti"
-#: templates/blacklist/blacklist.inc:31
+#: templates/blacklist/blacklist.inc:32
msgid "_Enter each address on a new line:"
msgstr "_Kirjuta iga aadress omaette reale:"
-#: lib/Ingo.php:322
+#: lib/Ingo.php:390
msgid "_Forward"
msgstr "_Edastus"
-#: templates/forward/forward.inc:17
-msgid "_Keep a copy of messages in this account?"
-msgstr "_Jäta kirja koopia oma postkasti"
-
#: templates/blacklist/blacklist.inc:22
msgid "_Move message to folder:"
msgstr "_Tõsta kiri kausta:"
-#: templates/vacation/vacation.inc:13
-msgid "_My email addresses:"
-msgstr "_Minu e-posti aadressid:"
+#: lib/Ingo.php:399
+msgid "_Permissions"
+msgstr "Õig_used"
-#: lib/Ingo.php:325
+#: lib/Ingo.php:396
msgid "_Script"
msgstr "_Skript"
-#: lib/Ingo.php:319
+#: lib/Ingo.php:387
msgid "_Vacation"
-msgstr "Äraoleku_teade"
+msgstr "Äraoleku teade"
-#: lib/Ingo.php:313
+#: lib/Ingo.php:381
msgid "_Whitelist"
-msgstr "_Valge nimekiri"
+msgstr "_Valgenimekiri"
-#: lib/Block/overview.php:51
+#: lib/Block/overview.php:54
msgid "active"
msgstr "aktiivne"
@@ -857,23 +995,23 @@ msgstr "aktiivne"
msgid "and"
msgstr "ja"
-#: templates/filters/filter.html:16
+#: templates/filters/filter.html:19
msgid "disabled - click to enable"
msgstr "välja lülitatud - klõpsa sisse lülitamiseks"
-#: filters.php:180
+#: filters.php:218
msgid "field"
msgstr "väli"
-#: lib/Block/overview.php:49
+#: lib/Block/overview.php:52
msgid "inactive"
msgstr "mitteaktiivne"
-#: lib/Script/maildrop.php:120
+#: lib/Script/maildrop.php:134
msgid "maildrop script generated by Ingo"
msgstr "Ingo genereeritud maildrop skript"
-#: filters.php:180
+#: filters.php:218
msgid "match"
msgstr "vastab"
@@ -881,10 +1019,6 @@ msgstr "vastab"
msgid "or"
msgstr "või"
-#: lib/Script/procmail.php:128
+#: lib/Script/procmail.php:130
msgid "procmail script generated by Ingo"
msgstr "Ingo genereeritud procmail skript"
-
-#: lib/Script/sieve.php:110
-msgid "sieve filter generated by Ingo"
-msgstr "Ingo genereeritud sieve skript"
diff --git a/po/pt_PT.po b/po/eu_ES.po
similarity index 56%
copy from po/pt_PT.po
copy to po/eu_ES.po
index 76c260a..8a1679f 100644
--- a/po/pt_PT.po
+++ b/po/eu_ES.po
@@ -1,343 +1,332 @@
-# INGO Portugal Portuguese translation.
-# Manuel Menezes de Sequeira <Manuel.Sequeira>, 2005.
-# Based on a previous
-# translation of pt_BR.po to Brazilian Portuguese
-# translation of ingo.po to Brazilian Portuguese
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR Horde Project.
-# Fabio Gomes <flgomes at fazenda.sp.gov.br>, 2005.
+# Basque translations for Ingo.
+# Copyright (C) 2008 Horde Project
+# This file is distributed under the same license as the Ingo package.
+# Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu.es>, 2008.
#
msgid ""
msgstr ""
-"Project-Id-Version: pt_PT\n"
+"Project-Id-Version: Ingo H3 (1.1)\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2006-12-26 23:59+0000\n"
-"PO-Revision-Date: 2007-01-06 10:12-0000\n"
-"Last-Translator: Manuel Menezes de Sequeira <Manuel.Sequeira at iscte.pt>\n"
-"Language-Team: Brazilian Portuguese <i18n at lists.horde.org>\n"
+"POT-Creation-Date: 2008-01-16 09:33+0100\n"
+"PO-Revision-Date: 2008-07-17 14:26+0200\n"
+"Last-Translator: Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu."
+"es>\n"
+"Language-Team: Euskal Herriko Unibertsitatea EHU/UPV <xabier.arrieta at ehu."
+"es>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: filters.php:189
msgid " and"
-msgstr " e"
+msgstr " eta"
#: filters.php:189
msgid " or"
-msgstr " ou"
+msgstr " edo"
#: templates/blacklist/blacklist.inc:17
msgid "Action for blacklisted addresses:"
-msgstr "Acção para endereços na lista negra:"
+msgstr "Zerrenda beltzeko helbideen ekintza:"
#: templates/script/activate.inc:10
msgid "Activate Script"
-msgstr "Activar \"Script\""
+msgstr "Aktibatu script-a"
#: lib/Driver/ldap.php:232
#, php-format
msgid "Activating the script for \"%s\" failed: (%d) %s"
-msgstr "A activação do \"script\" para \"%s\" falhou: (%d) %s"
+msgstr "Huts egin du \"%s\"(r)en script-a aktibatzean: (%d) %s"
#: templates/filters/settings.inc:8
msgid "Additional Settings"
-msgstr "Configurações Adicionais"
+msgstr "Beste ezarpen batzuk"
#: templates/rule/header.inc:44
msgid "All of the following"
-msgstr "Todos os seguintes"
+msgstr "Ondoko guztiarekin"
#: lib/api.php:54
msgid "Allow Rules"
-msgstr "Permitir Regras"
+msgstr "Onartu arauak"
#: templates/rule/footer.inc:33
msgid "Answered"
-msgstr "Respondido"
+msgstr "Erantzunda"
#: templates/rule/header.inc:45
msgid "Any of the following"
-msgstr "Qualquer dos seguintes"
+msgstr "Ondoko guztietako edozeinekin"
#: templates/filters/footer.inc:8
msgid "Apply Filters"
-msgstr "Aplicar Filtros"
+msgstr "Aplikatu iragazkiak"
#: filters.php:218
msgid "Are you sure you want to delete this rule?"
-msgstr "Tem a certeza que quer remover esta regra?"
+msgstr "Ziur zaude arau hau ezabatu nahi duzula?"
#: config/prefs.php.dist:33
msgid "Automatically update the script after each change?"
-msgstr "Actualizar automaticamente o \"script\" depois de cada alteração?"
+msgstr "Automatikoki eguneratu script-a aldaketa bakoitzaren ondoren?"
#: config/fields.php.dist:47
msgid "Bcc"
-msgstr "Cco"
+msgstr "Bcc"
#: lib/Storage.php:379
msgid "Begins with"
-msgstr "Começa com"
+msgstr "Honela hasten da"
#: lib/Driver/ldap.php:106 lib/Driver/ldap.php:111
#, php-format
msgid "Bind failed: (%s) %s"
-msgstr "Ligação falhou: (%s) %s"
+msgstr "Loturak huts egin du: (%s) %s"
-#: filters.php:148 templates/blacklist/blacklist.inc:7
-#: lib/Block/overview.php:87 lib/Block/overview.php:90
+#: filters.php:148 lib/Block/overview.php:95 lib/Block/overview.php:98
+#: templates/blacklist/blacklist.inc:7
msgid "Blacklist"
-msgstr "Lista Negra"
+msgstr "Zerrenda beltza"
#: blacklist.php:107
msgid "Blacklist Edit"
-msgstr "Editar Lista Negra"
+msgstr "Editatu zerrenda beltza"
#: blacklist.php:17
msgid "Blacklist is not supported in the current filtering driver."
-msgstr "A Lista Negra não é suportada pelo mecanismo de filtragem corrente."
+msgstr "Uneko iragazte-kontrolatzaileak ez du zerrenda beltzik onartzen."
-#: lib/Script/procmail.php:207 lib/Script/sieve.php:244
+#: lib/Script/sieve.php:244 lib/Script/procmail.php:207
#: lib/Script/maildrop.php:176
msgid "Blacklisted Addresses"
-msgstr "Endereços na Lista Negra"
+msgstr "Zerrenda beltzeko helbideak"
#: config/fields.php.dist:88
msgid "Body"
-msgstr "Corpo"
+msgstr "Testua"
#: filters.php:186 rule.php:281
msgid "Case Sensitive"
-msgstr "Discrimina Maiúsculas de Minúsculas"
+msgstr "Maiuskula/minuskula"
#: config/fields.php.dist:43
msgid "Cc"
msgstr "Cc"
-#: rule.php:122 whitelist.php:36 forward.php:33 vacation.php:41
+#: whitelist.php:36 rule.php:122 vacation.php:41 forward.php:33
#: blacklist.php:73
msgid "Changes saved."
-msgstr "Alterações guardadas."
+msgstr "Aldaketak gorde dira."
#: lib/Driver/ldap.php:75
msgid "Connection failure"
-msgstr "Falha de ligação"
+msgstr "Konexioak huts egin du"
#: lib/Storage.php:375
msgid "Contains"
-msgstr "Contém"
+msgstr "Hau dauka"
#: filters.php:229 filters.php:230
#, php-format
msgid "Copy %s"
-msgstr "Copiar %s"
+msgstr "Kopiatu %s"
#: lib/Storage.php:875
#, php-format
msgid "Copy of %s"
-msgstr "Cópia de %s"
+msgstr "Kopia - %s"
#: lib/Ingo.php:62
msgid "Create new folder"
-msgstr "Criar nova pasta"
+msgstr "Sortu karpeta berria"
#: lib/Script/procmail.php:336 lib/Script/maildrop.php:280
msgid "DISABLED: "
-msgstr "DESACTIVADA: "
+msgstr "DESGAITUTA: "
#: templates/script/activate.inc:17
msgid "Deactivate Script"
-msgstr "Desactivar \"Script\""
+msgstr "Desaktibatu script-a"
#: filters.php:218 filters.php:219
#, php-format
msgid "Delete %s"
-msgstr "Remover %s"
+msgstr "Ezabatu %s"
#: templates/rule/filter.inc:30
msgid "Delete Condition"
-msgstr "Remover Condição"
+msgstr "Ezabatu baldintza"
#: lib/Storage.php:323
msgid "Delete message completely"
-msgstr "Remover mensagem completamente"
+msgstr "Ezabatu mezua erabat"
#: templates/rule/footer.inc:35
msgid "Deleted"
-msgstr "Removida"
+msgstr "Ezabatuta"
#: lib/Storage.php:311
msgid "Deliver into my Inbox"
-msgstr "Entregar na minha Caixa de Entrada"
+msgstr "Banatu nire sarrerako ontzian"
#: lib/Storage.php:337
msgid "Deliver into my Inbox and copy to"
-msgstr "Entregar na minha Caixa de Entrada e copiar para"
+msgstr "Banatu sarrerako ontzian eta kopiatu hona"
#: lib/Storage.php:332
msgid "Deliver into my Inbox and redirect to"
-msgstr "Entregar na minha Caixa de Entrada e redireccionar para"
+msgstr "Banatu sarrerako ontzian eta birbideratu hona"
#: lib/Storage.php:317
msgid "Deliver to folder"
-msgstr "Entregar na pasta"
+msgstr "Banatu karpetan"
#: filters.php:242 filters.php:243
#, php-format
msgid "Disable %s"
-msgstr "Desativar %s "
+msgstr "Desgaitu %s"
-#: templates/whitelist/whitelist.inc:10 templates/blacklist/blacklist.inc:10
-#: templates/vacation/vacation.inc:6 templates/forward/forward.inc:10
-#: templates/rule/header.inc:26
+#: templates/vacation/vacation.inc:6 templates/rule/header.inc:26
+#: templates/forward/forward.inc:10 templates/blacklist/blacklist.inc:10
+#: templates/whitelist/whitelist.inc:10
msgid "Disabled"
-msgstr "Desativado"
+msgstr "Desgaituta"
#: templates/filters/settings.inc:15
msgid "Display detailed notification when each filter is applied?"
-msgstr "Mostrar notificação pormenorizada quando cada filtro for aplicado?"
+msgstr "Jakinarazpen xehea bistaratu iragazki bakoitza aplikatzen denean?"
#: templates/vacation/vacation.inc:34
msgid "Do _not send responses to bulk or list messages"
-msgstr ""
-"_Não enviar respostas para mensagens em massa ou de listas de correio "
-"electrónico"
+msgstr "E_z erantzun mezu baztergarriei edo masiboei"
#: templates/rule/footer.inc:10
msgid "Do this:"
-msgstr "Fazer isto:"
+msgstr "Egin ondokoa:"
#: lib/Storage.php:380
msgid "Doesn't begin with"
-msgstr "Não começa com"
+msgstr "Ez da honela hasten"
#: lib/Storage.php:376
msgid "Doesn't contain"
-msgstr "Não contém"
+msgstr "Ez dauka"
#: lib/Storage.php:382
msgid "Doesn't end with"
-msgstr "Não termina com"
+msgstr "Ez da honela amaitzen"
#: lib/Storage.php:384
msgid "Doesn't exist"
-msgstr "Não existe"
+msgstr "Ez dago"
#: lib/Storage.php:387
msgid "Doesn't match (with placeholders)"
-msgstr "Não corresponde a (com marcações)"
+msgstr "Ez dator bat (leku-markekin)"
-#: templates/filters/header.inc:46 lib/Block/overview.php:61
-#: lib/Block/overview.php:68 lib/Block/overview.php:81
-#: lib/Block/overview.php:89
+#: lib/Block/overview.php:63 lib/Block/overview.php:72
+#: lib/Block/overview.php:87 lib/Block/overview.php:97
+#: templates/filters/header.inc:46
msgid "Edit"
-msgstr "Editar"
+msgstr "Editatu"
#: filters.php:207 filters.php:209 filters.php:213 filters.php:214
#, php-format
msgid "Edit %s"
-msgstr "Editar %s"
+msgstr "Editatu %s"
#: filters.php:246 filters.php:247
#, php-format
msgid "Enable %s"
-msgstr "Activar %s"
+msgstr "Gaitu %s"
#: templates/filters/header.inc:48
msgid "Enabled"
-msgstr "Activado"
+msgstr "Gaituta"
#: lib/Storage.php:381
msgid "Ends with"
-msgstr "Termina com"
+msgstr "Honela amaitzen da"
#: lib/Storage.php:392
msgid "Equal to"
-msgstr "Igual a"
+msgstr "Berdin"
#: lib/Driver/ldap.php:139 lib/Driver/ldap.php:149 lib/Driver/ldap.php:158
#: lib/Driver/ldap.php:168
#, php-format
msgid "Error retrieving current script: (%d) %s"
-msgstr "Erro ao aceder ao \"script\" corrente: (%d) %s"
+msgstr "Errorea uneko script-a eskuratzean: (%d) %s"
#: blacklist.php:71
msgid "Error saving changes."
-msgstr "Erro ao guardar as alterações."
+msgstr "Errorea aldaketak gordetzean."
#: templates/filters/header.inc:41
msgid "Existing Rules"
-msgstr "Regras Existentes"
+msgstr "Arauak"
#: lib/Storage.php:383
msgid "Exists"
-msgstr "Existe"
+msgstr "Badago"
#: lib/Driver/ldap.php:144
#, php-format
msgid "Expected 1 object, got %d."
-msgstr "Esperava 1 objecto, obtive %d."
+msgstr "Objektu 1 espero zen, % lortu dira."
#: templates/filters/settings.inc:22
msgid "Filter All Messages"
-msgstr "Filtrar Todas as Mensagens"
+msgstr "Iragazi mezu guztiak"
#: templates/filters/settings.inc:24
msgid "Filter Only Seen Messages"
-msgstr "Filtrar Apenas Mensagens Lidas"
+msgstr "Iragazi ikusitako mezuak bakarrik"
#: templates/filters/settings.inc:23
msgid "Filter Only Unseen Messages"
-msgstr "Filtrar Apenas Mensagens Por Ler"
+msgstr "Iragazi ikusi gabeko mezuak bakarrik"
#: templates/filters/settings.inc:20
msgid "Filter Options"
-msgstr "Opções de Filtragem"
+msgstr "Iragazteko aukerak"
#: templates/rule/header.inc:25
msgid "Filter Rule"
-msgstr "Regra de Filtragem"
+msgstr "Iragazteko araua"
#: filters.php:113
msgid "Filter Rules"
-msgstr "Regras de Filtragem"
+msgstr "Iragazteko arauak"
#: script.php:52
msgid "Filter Script Display"
-msgstr "Visualização do \"Script\" de Filtragem"
+msgstr "Iragazteko script-aren bistaratzea"
#: lib/Ingo.php:321
msgid "Filter _Rules"
-msgstr "_Regras de Filtragem"
+msgstr "Iragazteko _arauak"
#: lib/Script/imap.php:314
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
-msgstr ""
-"Actividade de filtragem: %s mensagem(ns) foi(ram) copiada(s) para a pasta \"%"
-"s\"."
+msgstr "Iragazkiaren jarduera: %s mezu kopiatu dira \"%s\" karpetan."
#: lib/Script/imap.php:301
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
-msgstr "Actividade de filtragem: %s mensagem(ns) foi(ram) removidas(s)."
+msgstr "Iragazkiaren jarduera: %s mezu ezabatu dira."
#: lib/Script/imap.php:279
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
-msgstr ""
-"Actividade de filtragem: %s mensagem(ns) foi(ram) movida(s) para a pasta \"%s"
-"\"."
+msgstr "Iragazkiaren jarduera: %s mezu eraman dira \"%s\" karpetara."
#: lib/Script/imap.php:182
#, php-format
msgid "Filter activity: %s message(s) that matched the blacklist were deleted."
msgstr ""
-"Actividade de filtragem: %s mensagem(ns) com correspondente na lista negra "
-"foi(ram) removidas(s)."
+"Iragazkiaren jarduera: zerrenda beltzarekin bat zetozen %s mezu ezabatu dira."
#: lib/Script/imap.php:311
#, php-format
@@ -345,13 +334,13 @@ msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
"folder \"%s\"."
msgstr ""
-"Actividade de filtragem: A mensagem \"%s\" de \"%s\" foi copiada para a "
-"pasta \"%s\"."
+"Iragazkiaren jarduera: \"%2$s\"(r)en \"%1$s\" mezua \"%3$s\" karpetan "
+"kopiatu da."
#: lib/Script/imap.php:296
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
-msgstr "Actividade de filtragem: A mensagem \"%s\" de \"%s\" foi removida."
+msgstr "Iragazkiaren jarduera: \"%2$s\"(r)en \"%1$s\" mezua ezabatu egin da."
#: lib/Script/imap.php:273
#, php-format
@@ -359,111 +348,109 @@ msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
"\"%s\"."
msgstr ""
-"Actividade de Filtragem: A mensagem \"%s\" de \"%s\" foi movida para a pasta "
-"\"%s\"."
+"Iragazkiaren jarduera: \"%2$s\"(r)en \"%1$s\" mezua \"%3$s\" karpetara "
+"eraman da."
#: rule.php:160
msgid "Filter not found."
-msgstr "Filtro não encontrado."
+msgstr "Iragazkia ez da aurkitu."
#: templates/rule/header.inc:42
msgid "For an incoming message that matches:"
-msgstr "Para uma mensagem recém-chegada que corresponda:"
+msgstr "Honekin bat datorren iritsitako mezu bakoitza:"
-#: filters.php:166 templates/forward/forward.inc:8 lib/Block/overview.php:67
-#: lib/Block/overview.php:69
+#: filters.php:166 lib/Block/overview.php:71 lib/Block/overview.php:73
+#: templates/forward/forward.inc:8
msgid "Forward"
-msgstr "Redirecionamento"
+msgstr "Birbidali"
#: forward.php:16
msgid "Forward is not supported in the current filtering driver."
-msgstr ""
-"O redireccionamento não é suportado pelo mecanismo de filtragem corrente."
+msgstr "Uneko iragazte-kontrolatzaileak ez du birbidaltzerik onartzen."
-#: lib/Script/procmail.php:282 lib/Script/sieve.php:214
+#: lib/Script/sieve.php:214 lib/Script/procmail.php:282
#: lib/Script/maildrop.php:225
msgid "Forwards"
-msgstr "Redireccionamentos"
+msgstr "Birbidalketak"
#: forward.php:45
msgid "Forwards Edit"
-msgstr "Editar Redireccionamentos"
+msgstr "Editatu birbidalketak"
#: config/fields.php.dist:39
msgid "From"
-msgstr "De"
+msgstr "Nork"
#: lib/Script/sieve.php:2066
msgid "From:"
-msgstr "De:"
+msgstr "Nork:"
#: lib/Script/sieve.php:110
msgid "Generated by Ingo (http://www.horde.org/ingo/)"
-msgstr "Gerado pelo Ingo (http://www.horde.org/ingo/)"
+msgstr "Ingo-k sortua (http://www.horde.org/ingo/)"
#: lib/Storage.php:390
msgid "Greater than"
-msgstr "Maior que"
+msgstr "Hau baino handiagoa"
#: lib/Storage.php:391
msgid "Greater than or equal to"
-msgstr "Maior ou igual a"
+msgstr "Hau baino handiagoa edo berdina da"
#: templates/rule/footer.inc:31
msgid "Important"
-msgstr "Importante"
+msgstr "Garrantzitsua"
#: rule.php:36
msgid "Individual rules are not supported in the current filtering driver."
-msgstr ""
-"Regras individuais não são suportadas pelo mecanismo de filtragem corrente."
+msgstr "Uneko iragazte-kontrolatzaileak ez du arau indibidualik onartzen."
#: lib/Script/sieve.php:1864
msgid "Inexistant mailbox specified for message delivery."
-msgstr "Caixa postal especificada para entrega não existe."
+msgstr "Mezua banatzeko zehaztutako postontzia ez dago."
#: lib/Storage.php:377
msgid "Is"
-msgstr "É"
+msgstr "Hau da"
#: lib/Storage.php:378
msgid "Isn't"
-msgstr "Não é"
+msgstr "Ez da hau"
#: lib/Driver/ldap.php:23
msgid ""
"LDAP support is required but the LDAP module is not available or not loaded."
msgstr ""
-"Suporte LDAP é necessário mas o módulo LDAP não está disponível ou não está "
-"carregado."
+"LDAP euskarria behar da, baina LDAP modulua ez dago erabilgarri edo ez da "
+"kargatu."
#: lib/Storage.php:388
msgid "Less than"
-msgstr "Menor que"
+msgstr "Hau baino txikiagoa"
#: lib/Storage.php:389
msgid "Less than or equal to"
-msgstr "Menor ou igual a"
+msgstr "Txikiago edo berdin"
#: config/fields.php.dist:59
msgid "List-ID"
-msgstr "ID da Lista"
+msgstr "List-Id"
#: templates/blacklist/blacklist.inc:20
msgid "Mar_k message as deleted"
-msgstr "Mar_car mensagem como removida"
+msgstr "_Markatu mezua ezabatutako gisa"
#: templates/rule/footer.inc:24
msgid "Mark message as:"
-msgstr "Marcar mensagem como:"
+msgstr "Markatu mezua honela:"
#: lib/Storage.php:386
msgid "Matches (with placeholders)"
-msgstr "Corresponde a (com marcadores)"
+msgstr "Bat dator (leku-markekin)"
#: lib/api.php:57
msgid "Maximum Number of Rules"
-msgstr "Número Máximo de Regras"
+msgstr "Arauen gehieneko kopurua"
#: lib/Storage.php:513
#, php-format
@@ -471,9 +458,9 @@ msgid ""
"Maximum number of blacklisted addresses exceeded (Total addresses: %s, "
"Maximum addresses: %s). Could not add new addresses to blacklist."
msgstr ""
-"Excedido o número máximo de endereços na lista negra (Total de endereços: %"
-"s, Máximo de endereços: %s). Impossível adicionar novos endereços à lista "
-"negra."
+"Zerrenda beltzeko helbideen gehieneko kopurua gainditu da (Helbideak "
+"guztira: %s, Gehieneko kopurua: %s). Ezin izan da helbide berririk gehitu "
+"zerrenda beltzean."
#: lib/Storage.php:566
#, php-format
@@ -481,452 +468,451 @@ msgid ""
"Maximum number of whitelisted addresses exceeded (Total addresses: %s, "
"Maximum addresses: %s). Could not add new addresses to whitelist."
msgstr ""
-"Excedido o número máximo de endereços na lista branca (Total de endereços: %"
-"s, Máximo de endereços: %s). Impossível adicionar novos endereços à lista "
-"branca."
+"Zerrenda zuriko helbideen gehieneko kopurua gainditu da (Helbideak guztira: %"
+"s, Gehieneko kopurua: %s). Ezin izan da helbide berririk gehitu zerrenda "
+"zurian."
#: lib/Script/sieve.php:2074
msgid "Missing address to notify"
-msgstr "Endereço de notificação em falta"
+msgstr "Jakinarazpena bidali beharreko helbidea falta da"
#: lib/Script/sieve.php:1732
msgid "Missing address to redirect message to"
-msgstr "Endereço de redireccionamento em falta"
+msgstr "Mezua birbideratu beharreko helbidea falta da"
#: lib/Script/sieve.php:1764
msgid "Missing reason for reject"
-msgstr "Razão para rejeição em falta"
+msgstr "Ezesteko arrazoia falta da"
#: lib/Script/sieve.php:1931
msgid "Missing reason in vacation."
-msgstr "Razão para mensagem de ausência em falta."
+msgstr "Kanpoan egoteko arrazoia falta da."
#: templates/filters/header.inc:49
msgid "Move"
-msgstr "Mover"
+msgstr "Lekuz aldatu"
#: filters.php:130 filters.php:239
msgid "Move Rule Down"
-msgstr "Mover Regra para Baixo"
+msgstr "Eraman araua behera"
#: filters.php:131 filters.php:238
msgid "Move Rule Up"
-msgstr "Mover Regra para Cima"
+msgstr "Eraman araua gora"
#: templates/vacation/vacation.inc:42
msgid "N_umber of days between vacation replies:"
-msgstr "_Número de dias entre as mensagens de ausência:"
+msgstr "_Kanpoan zaudeneko erantzunen arteko egun kopurua:"
-#: templates/filters/filter-none.inc:3 templates/filters/footer.inc:6
-#: lib/Storage.php:771
+#: lib/Storage.php:771 templates/filters/footer.inc:6
+#: templates/filters/filter-none.inc:3
msgid "New Rule"
-msgstr "Nova Regra"
+msgstr "Arau berria"
#: lib/Ingo.php:235 lib/Ingo.php:237
#, php-format
msgid "No \"%s\" element found in backend configuration."
-msgstr "O elemento \"%s\" não foi encontrado na configuração de base."
+msgstr "Ez da \"%s\" elementurik aurkitu modulu-konfigurazioan."
#: lib/Ingo.php:233
msgid "No backend configured for this host"
-msgstr "Não há uma configuração de base para este servidor"
+msgstr "Ez da modulurik konfiguratu ostalari honentzat"
#: lib/Ingo.php:210
msgid "No backends configured in backends.php"
-msgstr "Nenhuma configuração de base em backends.php"
+msgstr "Ez dago modulurik konfiguratuta backends.php-n"
#: templates/filters/filter-none.inc:3
#, php-format
msgid "No filters. Click \"%s\" to create a new filter."
-msgstr "Nenhum filtro. Clique em \"%s\"' para criar um novo filtro."
+msgstr "Iragazkirik ez. Hautatu \"%s\" iragazki berri bat sortzeko."
#: lib/Script/sieve.php:1332 lib/Script/sieve.php:1425
#: lib/Script/sieve.php:1602
msgid "No headers specified"
-msgstr "Nenhum cabeçalho especificado"
+msgstr "Ez da goibururik zehaztu"
#: script.php:67
msgid "No script generated."
-msgstr "Nenhum \"script\" gerado."
+msgstr "Ez da script-ik sortu."
#: lib/Script/sieve.php:1618
msgid "No strings specified"
-msgstr "Nenhuma cadeia de caracteres especificada"
+msgstr "Ez da katerik zehaztu"
#: lib/Storage.php:393
msgid "Not equal to"
-msgstr "Diferente de"
+msgstr "Desberdina"
#: lib/Storage.php:353
msgid "Notify email address"
-msgstr "Endereço de correio electrónico de notificação"
+msgstr "Jakinarazi posta-helbidea"
#: lib/Storage.php:347
msgid "Only flag the message"
-msgstr "Apenas marcar a mensagem"
+msgstr "Jarri bandera mezuari bakarrik"
#: config/prefs.php.dist:19
msgid "Options about script updating."
-msgstr "Opções sobre actualização de \"scripts\"."
+msgstr "Script-ak eguneratzeari buruzko aukerak."
#: config/prefs.php.dist:17
msgid "Other Options"
-msgstr "Outras Opções"
+msgstr "Beste aukera batzuk"
#: lib/Block/overview.php:3
msgid "Overview"
-msgstr "Visão Geral"
+msgstr "Aurkezpen orokorra"
#: templates/javascript/new_folder.js:6
msgid "Please enter the name of the new folder:"
-msgstr "Por favor introduza o nome da nova pasta:"
+msgstr "Idatzi karpeta berriaren izena:"
#: templates/vacation/vacation.inc:60
msgid "R_eason"
-msgstr "R_azão"
+msgstr "_Arrazoia"
#: config/fields.php.dist:63
msgid "Received"
-msgstr "Recebida"
+msgstr "Jasotze-data"
#: lib/Storage.php:328
msgid "Redirect to"
-msgstr "Redirecionar para"
+msgstr "Birbideratu hona"
#: lib/Storage.php:385
msgid "Regular expression"
-msgstr "Expressão regular"
+msgstr "Adierazpen erregularra"
#: lib/Storage.php:343
msgid "Reject with reason"
-msgstr "Rejeitar com razão"
+msgstr "Ezetsi arrazoiarekin"
#: config/fields.php.dist:55
msgid "Resent To"
-msgstr "Reenviada Para"
+msgstr "Bidali berriro honi"
#: config/fields.php.dist:51
msgid "Resent-from"
-msgstr "Reenviada De"
+msgstr "Honek berriro bidalia"
#: templates/rule/footer.inc:60
msgid "Return to Filters List"
-msgstr "Voltar à Lista de Filtros"
+msgstr "Itzuli iragazkien zerrendara"
-#: templates/whitelist/whitelist.inc:24 templates/blacklist/blacklist.inc:41
#: templates/vacation/vacation.inc:71 templates/forward/forward.inc:34
+#: templates/blacklist/blacklist.inc:41 templates/whitelist/whitelist.inc:24
msgid "Return to Rules List"
-msgstr "Voltar à Lista de Regras"
+msgstr "Itzuli arauen zerrendara"
#: templates/filters/header.inc:47
msgid "Rule"
-msgstr "Regra"
+msgstr "Araua"
#: filters.php:63
msgid "Rule Copied"
-msgstr "Regra Copiada"
+msgstr "Araua kopiatu da"
#: filters.php:42
msgid "Rule Deleted"
-msgstr "Regra Removida"
+msgstr "Araua ezabatu da"
#: filters.php:79
msgid "Rule Disabled"
-msgstr "Regra Desactivada"
+msgstr "Araua desgaitu da"
#: filters.php:84
msgid "Rule Enabled"
-msgstr "Regra Activada"
+msgstr "Araua gaitu da"
#: templates/rule/header.inc:33
msgid "Rule Name"
-msgstr "Nome da Regra"
+msgstr "Arauaren izena"
#: lib/Script/sieve.php:2068
msgid "Rule:"
-msgstr "Regra:"
+msgstr "Araua:"
#: lib/Driver/ldap.php:88
#, php-format
msgid "STARTTLS failed: (%s) %s"
-msgstr "STARTLS falhou: (%s) %s"
+msgstr "STARTTLSek huts egin du: (%s) %s"
-#: templates/whitelist/whitelist.inc:23 templates/blacklist/blacklist.inc:40
-#: templates/vacation/vacation.inc:70 templates/forward/forward.inc:33
-#: templates/rule/footer.inc:59
+#: templates/vacation/vacation.inc:70 templates/rule/footer.inc:59
+#: templates/forward/forward.inc:33 templates/blacklist/blacklist.inc:40
+#: templates/whitelist/whitelist.inc:23
msgid "Save"
-msgstr "Guardar"
+msgstr "Gorde"
#: templates/filters/settings.inc:31
msgid "Save Settings"
-msgstr "Guardar Configurações"
+msgstr "Gorde ezarpenak"
#: templates/script/header.inc:2
msgid "Script"
-msgstr "\"Script\""
+msgstr "Script-a"
#: config/prefs.php.dist:18
msgid "Script Updating"
-msgstr "Atualização de \"Scripts\""
+msgstr "Script-a eguneratzea"
#: lib/Ingo.php:186
msgid "Script not updated."
-msgstr "\"Scripts\" não foi atualizado."
+msgstr "Script-a ez da eguneratu."
#: lib/Ingo.php:141
msgid "Script successfully activated."
-msgstr "\"Script\" activado com sucesso."
+msgstr "Script-a ondo aktibatu da."
#: lib/Ingo.php:140
msgid "Script successfully deactivated."
-msgstr "\"Script\" desativado com sucesso."
+msgstr "Script-a ondo desaktibatu da."
#: templates/rule/footer.inc:29
msgid "Seen"
-msgstr "Lido"
+msgstr "Ikusita"
#: rule.php:190
msgid "Select a field"
-msgstr "Seleccione o campo"
+msgstr "Hautatu eremua"
#: lib/Ingo.php:59
msgid "Select target folder"
-msgstr "Seleccione a pasta alvo"
+msgstr "Hautatu helburu-karpeta"
#: rule.php:227
msgid "Self-Defined Header"
-msgstr "Cabeçalho Personalizado"
+msgstr "Erabiltzaileak definitutako goiburua"
#: config/fields.php.dist:35
msgid "Sender"
-msgstr "Remetente"
+msgstr "Bidaltzailea"
#: filters.php:98
msgid "Settings successfully updated."
-msgstr "Configurações actualizadas com sucesso."
+msgstr "Ezarpenak ondo eguneratu dira."
#: templates/script/activate.inc:24
msgid "Show Active Script"
-msgstr "Mostrar \"Script\" Activo"
+msgstr "Erakutsi script aktiboa"
#: templates/script/activate.inc:31
msgid "Show Current Script"
-msgstr "Mostrar \"Script\" Corrente"
+msgstr "Erakutsi uneko script-a"
#: config/fields.php.dist:83
msgid "Size"
-msgstr "Tamanho"
+msgstr "Tamaina"
#: templates/rule/footer.inc:49
msgid "Stop checking if this rule matches?"
-msgstr "Parar a verificação quando esta regra for executada?"
+msgstr "Egiaztatzeari utzi araua bat badator?"
#: templates/vacation/vacation.inc:51
msgid "Subje_ct of vacation message:"
-msgstr "A_ssunto da mensagem de ausência:"
+msgstr "_Kanpoan zaudeneko mezuaren gaia:"
#: config/fields.php.dist:31
msgid "Subject"
-msgstr "Assunto"
+msgstr "Gaia"
#: lib/Script/sieve.php:2067
msgid "Subject:"
-msgstr "Assunto:"
+msgstr "Gaia:"
#: lib/api.php:85
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
-msgstr "O endereço \"%s\" foi adicionado à sua lista negra."
+msgstr "\"%s\" helbidea zerrenda beltzean gehitu da."
#: lib/api.php:104
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
-msgstr "O endereço \"%s\" foi adicionado à sua lista branca."
+msgstr "\"%s\" helbidea zerrenda zurian gehitu da."
#: lib/Ingo.php:136
msgid "The driver said: "
-msgstr "O mecanismo disse: "
+msgstr "Kontrolatzaileak hau esan du: "
#: lib/Ingo.php:135
msgid "There was an error activating the script."
-msgstr "Ocorreu um erro ao activar o \"script\"."
+msgstr "Errorea gertatu da script-a aktibatzean."
#: lib/Ingo.php:134
msgid "There was an error deactivating the script."
-msgstr "Ocorreu um erro ao desativar o \"script\"."
+msgstr "Errorea gertatu da script-a desaktibatzean."
#: config/fields.php.dist:27
msgid "To"
-msgstr "Para"
+msgstr "Nori"
#: templates/filters/filter.html:23
msgid "To:"
-msgstr "Para:"
+msgstr "Nori:"
#: lib/Script.php:127
#, php-format
msgid "Unable to load the definition of %s."
-msgstr "Impossível actualizar a definição de %s."
+msgstr "Ezin da kargatu %s(r)en definizioa."
-#: filters.php:160 templates/vacation/vacation.inc:5
-#: lib/Script/procmail.php:262 lib/Script/sieve.php:352
-#: lib/Block/overview.php:60 lib/Block/overview.php:62
+#: filters.php:160 lib/Script/sieve.php:352 lib/Script/procmail.php:262
+#: lib/Block/overview.php:61 lib/Block/overview.php:64
+#: templates/vacation/vacation.inc:5
msgid "Vacation"
-msgstr "Mensagens de Ausência"
+msgstr "Kanpoan"
#: vacation.php:71
msgid "Vacation Edit"
-msgstr "Editar Mensagens de Ausência"
+msgstr "Editatu kanpoan zaudeneko mezua"
#: vacation.php:16
msgid "Vacation is not supported in the current filtering driver."
msgstr ""
-"Mensagens de ausência não são suportadas pelo mecanismo de filtragem "
-"corrente."
+"Uneko iragazte-kontrolatzaileak ez du kanpoan zaudeneko baliabidea onartzen."
#: templates/whitelist/whitelist.inc:16
msgid "Wh_itelist addresses:"
-msgstr "Endereços na Lista _Branca:"
+msgstr "Z_errenda zuriko helbideak:"
-#: filters.php:154 templates/whitelist/whitelist.inc:8
-#: lib/Block/overview.php:79 lib/Block/overview.php:82
+#: filters.php:154 lib/Block/overview.php:85 lib/Block/overview.php:88
+#: templates/whitelist/whitelist.inc:8
msgid "Whitelist"
-msgstr "Lista Branca"
+msgstr "Zerrenda zuria"
#: whitelist.php:55
msgid "Whitelist Edit"
-msgstr "Editar Lista Branca"
+msgstr "Editatu zerrenda zuria"
#: whitelist.php:18
msgid "Whitelist is not supported in the current filtering driver."
-msgstr "Lista Branca não é supportada pelo mecanismo de filtragem corrente."
+msgstr "Uneko iragazte-kontrolatzaileak ez du zerrenda zuririk onartzen."
-#: lib/Script/procmail.php:234 lib/Script/sieve.php:298
+#: lib/Script/sieve.php:298 lib/Script/procmail.php:234
#: lib/Script/maildrop.php:203
msgid "Whitelisted Addresses"
-msgstr "Endereços na Lista Branca"
+msgstr "Zerrenda zuriko helbideak"
#: config/fields.php.dist:79
msgid "X-Priority"
-msgstr "X-Prioridade"
+msgstr "X-Priority"
#: config/fields.php.dist:67
msgid "X-Spam-Level"
-msgstr "X-Nível-de-Spam"
+msgstr "X-Spam-Level"
#: config/fields.php.dist:71
msgid "X-Spam-Score"
-msgstr "X-Classificação-de-Spam"
+msgstr "X-Spam-Score"
#: config/fields.php.dist:75
msgid "X-Spam-Status"
-msgstr "X-Estado-de-Spam"
+msgstr "X-Spam-Status"
#: filters.php:56 rule.php:144
#, php-format
msgid "You are not allowed to create more than %d rules."
-msgstr "Não tem autorização para criar mais do que %d regras."
+msgstr "Ez duzu baimenik %d arau baino gehiago sortzeko."
#: filters.php:48 rule.php:21
msgid "You are not allowed to create or edit custom rules."
-msgstr "Não tem autorização para criar ou alterar regras costumizadas."
+msgstr "Ez duzu baimenik arau pertsonalizatuak sortzeko edo editatzeko."
#: lib/Script/sieve.php:2065
msgid "You have received a new message"
-msgstr "Recebeu uma nova mensagem."
+msgstr "Mezu berri bat jaso duzu"
#: vacation.php:30
msgid ""
"You must specify at least one email address for which the vacation messages "
"should be activated."
msgstr ""
-"Tem de especificar pelo menos um endereço de correio electrónico para que a "
-"mensagem de ausência seja activada."
+"Helbide elektronikoren bat zehaztu behar duzu kanpoan zaudeneko mezuak "
+"aktibatu ahal izateko."
#: lib/Script/imap.php:274 lib/Script/imap.php:297 lib/Script/imap.php:311
msgid "[No Subject]"
-msgstr "[Sem Assunto]"
+msgstr "[Gairik ez]"
#: templates/forward/forward.inc:24
msgid "_Address(es) to forward to:"
-msgstr "_Endereço(s) para os quais redirecionar:"
+msgstr "_Birbideratu beharreko helbideak:"
#: templates/vacation/vacation.inc:23
msgid "_Addresses to not send responses to:"
-msgstr "_Endereço(s) ao(s) qual(is) não enviar respostas:"
+msgstr "_Erantzunik ez bidaltzeko helbideak:"
#: lib/Ingo.php:326
msgid "_Blacklist"
-msgstr "Lista _Negra"
+msgstr "_Zerrenda beltza"
#: templates/blacklist/blacklist.inc:18
msgid "_Delete message completely"
-msgstr "Remo_ver mensagem completamente"
+msgstr "Ez_abatu mezua erabat"
#: templates/blacklist/blacklist.inc:31
msgid "_Enter each address on a new line:"
-msgstr "_Introduza cada endereço em sua linha:"
+msgstr "_Sartu helbide bakoitza lerro berri batean:"
#: lib/Ingo.php:332
msgid "_Forward"
-msgstr "_Redirecionamento"
+msgstr "_Birbidali"
#: templates/forward/forward.inc:17
msgid "_Keep a copy of messages in this account?"
-msgstr "_Manter uma cópia das mensagens nesta conta?"
+msgstr "_Mezuen kopia bat gorde kontu honetan?"
#: templates/blacklist/blacklist.inc:22
msgid "_Move message to folder:"
-msgstr "_Mover mensagem para a pasta:"
+msgstr "_Eraman mezuak karpeta honetara:"
#: templates/vacation/vacation.inc:13
msgid "_My email addresses:"
-msgstr "_Meu(s) endereço(s) de correio electrónico:"
+msgstr "_Nire helbide elektronikoak:"
#: lib/Ingo.php:335
msgid "_Script"
-msgstr "\"_Script\""
+msgstr "_Script-a"
#: lib/Ingo.php:329
msgid "_Vacation"
-msgstr "_Ausências"
+msgstr "_Kanpoan"
#: lib/Ingo.php:323
msgid "_Whitelist"
-msgstr "Lista _Branca"
+msgstr "Ze_rrenda zuria"
#: lib/Block/overview.php:54
msgid "active"
-msgstr "activa"
+msgstr "aktibo"
#: templates/rule/filter.inc:4
msgid "and"
-msgstr "e"
+msgstr "eta"
#: templates/filters/filter.html:13
msgid "disabled - click to enable"
-msgstr "inactivo - clique para activar"
+msgstr "desgaituta - egin klik gaitzeko"
#: filters.php:184
msgid "field"
-msgstr "campo"
+msgstr "eremua"
#: lib/Block/overview.php:52
msgid "inactive"
-msgstr "inactiva"
+msgstr "inaktibo"
#: lib/Script/maildrop.php:121
msgid "maildrop script generated by Ingo"
-msgstr "\"Script\" do procmail gerado pelo Ingo"
+msgstr "Ingo-k sortutako maildrop script-a"
#: filters.php:184
msgid "match"
-msgstr "corresponde"
+msgstr "bat etorri"
#: templates/rule/filter.inc:4
msgid "or"
-msgstr "ou"
+msgstr "edo"
#: lib/Script/procmail.php:128
msgid "procmail script generated by Ingo"
-msgstr "\"Script\" do procmail gerado pelo Ingo"
+msgstr "Ingo-k sortutako procmail script-a"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 824684c..30ba6f0 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Ingo 2.0-cvs\n"
+"Project-Id-Version: Ingo 1.2-cvs\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-17 16:38+0300\n"
-"PO-Revision-Date: 2008-05-20 12:59+0200\n"
+"POT-Creation-Date: 2008-08-10 21:20+0300\n"
+"PO-Revision-Date: 2008-08-20 12:59+0200\n"
"Last-Translator: Leena Heino <liinu at uta.fi>\n"
"Language-Team: Finnish <i18n at lists.horde.org>\n"
"MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Tarkemmat asetukset"
msgid "All of the following"
msgstr "Kaikki seuraavat"
-#: lib/api.php:68
+#: lib/api.php:73
msgid "Allow Rules"
msgstr "Salli säännöt"
@@ -76,7 +76,7 @@ msgstr "Suodata viestit"
msgid "Are you sure you want to delete this rule?"
msgstr "Oletko varma, että haluat poistaa tämän säännön?"
-#: config/prefs.php.dist:33
+#: config/prefs.php.dist:32
msgid "Automatically update the script after each change?"
msgstr "Päivitä skripti jokaisen muutoksen jälkeen."
@@ -111,7 +111,7 @@ msgid "Blacklist is not supported in the current filtering driver."
msgstr "Käytössä oleva suodatinajuri ei tue mustia listoja."
#: lib/Script/maildrop.php:197 lib/Script/procmail.php:219
-#: lib/Script/sieve.php:269
+#: lib/Script/sieve.php:276
msgid "Blacklisted Addresses"
msgstr "Mustalle listalle lisätyt osoitteet"
@@ -346,21 +346,21 @@ msgstr "Suodatins
msgid "Filter Script Display"
msgstr "Suodatusskripti näkymä"
-#: lib/Ingo.php:379
+#: lib/Ingo.php:384
msgid "Filter _Rules"
msgstr "Suodati_nsäännöt"
-#: lib/Script/imap.php:348
+#: lib/Script/imap.php:357
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr "Suodatintoiminto: %s viestiä on siirretty kansioon \"%s\"."
-#: lib/Script/imap.php:334
+#: lib/Script/imap.php:338
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr "Suodatintoiminto: %s viestiä on poistettu."
-#: lib/Script/imap.php:312
+#: lib/Script/imap.php:314
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr "Suodatintoiminto: %s viestiä on siirretty kansioon \"%s\"."
@@ -370,7 +370,7 @@ msgstr "Suodatintoiminto: %s viesti
msgid "Filter activity: %s message(s) that matched the blacklist were deleted."
msgstr "Suodatintoiminto: %s mustalla listalla olevaa viestiä on poistettu."
-#: lib/Script/imap.php:345
+#: lib/Script/imap.php:350
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
@@ -379,12 +379,12 @@ msgstr ""
"Suodatintoiminto: Viesti \"%s\" osoitteesta \"%s\" on kopioitu kansioon \"%s"
"\"."
-#: lib/Script/imap.php:329
+#: lib/Script/imap.php:332
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr "Suodatintoiminto: Viesti \"%s\" osoitteesta \"%s\" on poistettu."
-#: lib/Script/imap.php:306
+#: lib/Script/imap.php:307
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
@@ -414,7 +414,7 @@ msgstr "Kaikille tuleville viesteille, jotka sopivat:"
msgid "Forward"
msgstr "Uudelleenohjaa"
-#: lib/Script/sieve.php:222
+#: lib/Script/sieve.php:229
msgid "Forward Keep Action"
msgstr "Uudelleenohjauksen tallennustoiminto"
@@ -423,7 +423,7 @@ msgid "Forward is not supported in the current filtering driver."
msgstr "Käytössä oleva ajuri ei tue uudelleenohjausta."
#: lib/Script/maildrop.php:246 lib/Script/procmail.php:298
-#: lib/Script/sieve.php:232
+#: lib/Script/sieve.php:239
msgid "Forwards"
msgstr "Uudelleenohjaukset"
@@ -435,11 +435,11 @@ msgstr "Uudelleenohjauksen muokkaus"
msgid "From"
msgstr "Lähettäjä"
-#: lib/Script/sieve.php:2927
+#: lib/Script/sieve.php:2948
msgid "From:"
msgstr "Lähettäjä (From):"
-#: lib/Script/sieve.php:118
+#: lib/Script/sieve.php:123
msgid "Generated by Ingo (http://www.horde.org/ingo/)"
msgstr "Generated by Ingo (http://www.horde.org/ingo/)"
@@ -455,7 +455,7 @@ msgstr "Suurempi tai yht
msgid "Individual rules are not supported in the current filtering driver."
msgstr "Käytössä oleva ajuri ei tue yksittäisiä suodatinsääntöjä."
-#: lib/Script/sieve.php:2521
+#: lib/Script/sieve.php:2542
msgid "Inexistant mailbox specified for message delivery."
msgstr "Yrität ohjata viestejä olemattomaan postikansioon."
@@ -506,7 +506,7 @@ msgstr "T
msgid "Matches (with placeholders)"
msgstr "Täsmää (placeholderin kanssa)"
-#: lib/api.php:71
+#: lib/api.php:76
msgid "Maximum Number of Rules"
msgstr "Sääntöjen enimmäismäärä"
@@ -538,19 +538,19 @@ msgstr ""
"Viestit, joissa on suurempi roskapostiarvo kuin tämä tai suurempi "
"käsitellään roskapostina."
-#: lib/Script/sieve.php:2941
+#: lib/Script/sieve.php:2962
msgid "Missing address to notify"
msgstr "Ilmoitusviestin kohdeosoite puuttuu"
-#: lib/Script/sieve.php:2322
+#: lib/Script/sieve.php:2343
msgid "Missing address to redirect message to"
msgstr "Viestin uudelleenohjauksen kohdeosoite puuttuu"
-#: lib/Script/sieve.php:2368
+#: lib/Script/sieve.php:2389
msgid "Missing reason for reject"
msgstr "Hylkäämisviesti puuttuu"
-#: lib/Script/sieve.php:2671
+#: lib/Script/sieve.php:2692
msgid "Missing reason in vacation."
msgstr "Poissaoloviesti puuttuu."
@@ -575,16 +575,16 @@ msgstr "Omat s
msgid "New Rule"
msgstr "Uusi sääntö"
-#: lib/Ingo.php:230 lib/Ingo.php:232
+#: lib/Ingo.php:233 lib/Ingo.php:235
#, php-format
msgid "No \"%s\" element found in backend configuration."
msgstr "Elementtiä \"%s\" ei löytynyt taustajärjestelmän asetuksista."
-#: lib/Ingo.php:223
+#: lib/Ingo.php:226
msgid "No backend configured for this host"
msgstr "Taustajärjestelmää ei ole määritelty tälle palvelimelle"
-#: lib/Ingo.php:199
+#: lib/Ingo.php:202
msgid "No backends configured in backends.php"
msgstr "Taustajärjestelmiä ei ole määritelty backends.php tiedostossa"
@@ -593,8 +593,8 @@ msgstr "Taustaj
msgid "No filters. Click \"%s\" to create a new filter."
msgstr "Ei suodattimia. Napsauta \"%s\" tehdäksesi uuden suodattimen."
-#: lib/Script/sieve.php:1679 lib/Script/sieve.php:1828
-#: lib/Script/sieve.php:2044
+#: lib/Script/sieve.php:1692 lib/Script/sieve.php:1841
+#: lib/Script/sieve.php:2065
msgid "No headers specified"
msgstr "Otsakkeita ei ole määritelty"
@@ -602,7 +602,7 @@ msgstr "Otsakkeita ei ole m
msgid "No script generated."
msgstr "Skriptiä ei luotu."
-#: lib/Script/sieve.php:2060 lib/Script/sieve.php:2144
+#: lib/Script/sieve.php:2081 lib/Script/sieve.php:2165
msgid "No strings specified"
msgstr "Merkkijonoja ei ole määritelty"
@@ -622,11 +622,11 @@ msgstr "Monenko p
msgid "Only flag the message"
msgstr "Muuta vain viestin tilatietoa"
-#: config/prefs.php.dist:19
+#: config/prefs.php.dist:18
msgid "Options about script updating."
msgstr "Voit muuttaa skriptin päivitykseen liittyviä asetuksia."
-#: config/prefs.php.dist:17
+#: config/prefs.php.dist:16
msgid "Other Options"
msgstr "Muut asetukset"
@@ -704,7 +704,7 @@ msgstr "S
msgid "Rule Name:"
msgstr "Säännön nimi:"
-#: lib/Script/sieve.php:2929
+#: lib/Script/sieve.php:2950
msgid "Rule:"
msgstr "Sääntö:"
@@ -713,7 +713,7 @@ msgstr "S
msgid "STARTTLS failed: (%s) %s"
msgstr "STARTTLS epäonnistui: (%s) %s"
-#: lib/Ingo.php:393
+#: lib/Ingo.php:398
msgid "S_pam"
msgstr "Roska_posti"
@@ -735,25 +735,25 @@ msgstr "Talleta ja poista k
#: forward.php:57 forward.php:86 spam.php:107 spam.php:139 vacation.php:82
#: vacation.php:115
msgid "Save and Enable"
-msgstr "Taleta ja ota käyttöön"
+msgstr "Talleta ja ota käyttöön"
#: templates/script/header.inc:2
msgid "Script"
msgstr "Skripti"
-#: config/prefs.php.dist:18
+#: config/prefs.php.dist:17
msgid "Script Updating"
msgstr "Skriptin päivitys"
-#: lib/Ingo.php:175
+#: lib/Ingo.php:178
msgid "Script not updated."
msgstr "Skriptiä ei päivitetty."
-#: lib/Ingo.php:146
+#: lib/Ingo.php:149
msgid "Script successfully activated."
msgstr "Skriptin aktivointi onnistui."
-#: lib/Ingo.php:145
+#: lib/Ingo.php:148
msgid "Script successfully deactivated."
msgstr "Skriptin aktivointi onnistui."
@@ -806,7 +806,7 @@ msgstr "Koko"
msgid "Source (From,Reply-to,etc)"
msgstr "Lähde (From,Reply-to,etc)"
-#: filters.php:198 lib/Script/maildrop.php:301 lib/Script/sieve.php:425
+#: filters.php:198 lib/Script/maildrop.php:301 lib/Script/sieve.php:438
#: lib/Block/overview.php:105 lib/Block/overview.php:108
msgid "Spam Filter"
msgstr "Roskapostisuodatin"
@@ -835,29 +835,29 @@ msgstr "Otsikko"
msgid "Subject of vacation message:"
msgstr "Poissaoloviestin otsikko:"
-#: lib/Script/sieve.php:2928
+#: lib/Script/sieve.php:2949
msgid "Subject:"
msgstr "Otsikko:"
-#: lib/api.php:103
+#: lib/api.php:113
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr "Osoite \"%s\" on lisätty mustalle listallesi."
-#: lib/api.php:126
+#: lib/api.php:141
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr "Osoite \"%s\" on lisätty valkoiselle listallesi."
-#: lib/Ingo.php:141
+#: lib/Ingo.php:144
msgid "The driver said: "
msgstr "Ajurin virheilmoitus oli: "
-#: lib/Ingo.php:140
+#: lib/Ingo.php:143
msgid "There was an error activating the script."
msgstr "Skriptin aktivoinnissa tapahtui virhe."
-#: lib/Ingo.php:139
+#: lib/Ingo.php:142
msgid "There was an error deactivating the script."
msgstr "Skriptin ei-aktivoinnissa tapahtui virhe."
@@ -879,7 +879,7 @@ msgid "User header"
msgstr "Käytäjän määrittelemä otsake"
#: filters.php:186 vacation.php:151 lib/Script/maildrop.php:276
-#: lib/Script/procmail.php:278 lib/Script/sieve.php:399
+#: lib/Script/procmail.php:278 lib/Script/sieve.php:412
#: lib/Block/overview.php:61 lib/Block/overview.php:64
msgid "Vacation"
msgstr "Poissaoloviesti"
@@ -914,7 +914,7 @@ msgid "Whitelist is not supported in the current filtering driver."
msgstr "Käytössä oleva ajuri ei tue valkoista listaa."
#: lib/Script/maildrop.php:224 lib/Script/procmail.php:246
-#: lib/Script/sieve.php:329
+#: lib/Script/sieve.php:336
msgid "Whitelisted Addresses"
msgstr "Valkoiselle listalle lisätyt osoitteet"
@@ -956,15 +956,19 @@ msgstr "Sinulla ei ole oikeuksia poistaa suodatins
msgid "You do not have permission to edit filter rules."
msgstr "Sinulla ei ole oikeuksia muokata suodatinsääntöjä."
-#: lib/Script/sieve.php:2926
+#: lib/Script/sieve.php:2947
msgid "You have received a new message"
msgstr "Sinulle on tullut uusi viesti"
-#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+#: lib/Script/imap.php:309 lib/Script/imap.php:334 lib/Script/imap.php:352
+msgid "[No Sender]"
+msgstr "[Ei lähettäjää]"
+
+#: lib/Script/imap.php:308 lib/Script/imap.php:333 lib/Script/imap.php:351
msgid "[No Subject]"
msgstr "[Ei otsikkoa]"
-#: lib/Ingo.php:384
+#: lib/Ingo.php:389
msgid "_Blacklist"
msgstr "_Musta lista"
@@ -976,7 +980,7 @@ msgstr "_Poista viesti kokonaan"
msgid "_Enter each address on a new line:"
msgstr "_Laita jokainen osoite omalle rivilleen:"
-#: lib/Ingo.php:390
+#: lib/Ingo.php:395
msgid "_Forward"
msgstr "_Uudelleenohjaa"
@@ -984,19 +988,19 @@ msgstr "_Uudelleenohjaa"
msgid "_Move message to folder:"
msgstr "_Siirrä viesti kansioon:"
-#: lib/Ingo.php:399
+#: lib/Ingo.php:404
msgid "_Permissions"
msgstr "_Oikeudet"
-#: lib/Ingo.php:396
+#: lib/Ingo.php:401
msgid "_Script"
msgstr "_Skripti"
-#: lib/Ingo.php:387
+#: lib/Ingo.php:392
msgid "_Vacation"
msgstr "_Poissaoloviesti"
-#: lib/Ingo.php:381
+#: lib/Ingo.php:386
msgid "_Whitelist"
msgstr "_Valkoinen lista"
diff --git a/po/ingo.pot b/po/ingo.pot
index 5aa2e0b..93edbfa 100644
--- a/po/ingo.pot
+++ b/po/ingo.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2008-05-10 00:39+0200\n"
+"POT-Creation-Date: 2008-09-06 11:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "All of the following"
msgstr ""
-#: lib/api.php:68
+#: lib/api.php:73
msgid "Allow Rules"
msgstr ""
@@ -77,7 +77,7 @@ msgstr ""
msgid "Are you sure you want to delete this rule?"
msgstr ""
-#: config/prefs.php.dist:33
+#: config/prefs.php.dist:32
msgid "Automatically update the script after each change?"
msgstr ""
@@ -111,7 +111,7 @@ msgstr ""
msgid "Blacklist is not supported in the current filtering driver."
msgstr ""
-#: lib/Script/procmail.php:219 lib/Script/sieve.php:269
+#: lib/Script/procmail.php:219 lib/Script/sieve.php:276
#: lib/Script/maildrop.php:197
msgid "Blacklisted Addresses"
msgstr ""
@@ -211,7 +211,7 @@ msgid "Disable %s"
msgstr ""
#: spam.php:160 forward.php:99 vacation.php:153
-#: templates/whitelist/whitelist.inc:10 templates/blacklist/blacklist.inc:10
+#: templates/whitelist/whitelist.inc:8 templates/blacklist/blacklist.inc:10
#: templates/rule/header.inc:26
msgid "Disabled"
msgstr ""
@@ -347,21 +347,21 @@ msgstr ""
msgid "Filter Script Display"
msgstr ""
-#: lib/Ingo.php:379
+#: lib/Ingo.php:382
msgid "Filter _Rules"
msgstr ""
-#: lib/Script/imap.php:348
+#: lib/Script/imap.php:357
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr ""
-#: lib/Script/imap.php:334
+#: lib/Script/imap.php:338
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr ""
-#: lib/Script/imap.php:312
+#: lib/Script/imap.php:314
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr ""
@@ -371,19 +371,19 @@ msgstr ""
msgid "Filter activity: %s message(s) that matched the blacklist were deleted."
msgstr ""
-#: lib/Script/imap.php:345
+#: lib/Script/imap.php:350
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
"folder \"%s\"."
msgstr ""
-#: lib/Script/imap.php:329
+#: lib/Script/imap.php:332
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr ""
-#: lib/Script/imap.php:306
+#: lib/Script/imap.php:307
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
@@ -411,7 +411,7 @@ msgstr ""
msgid "Forward"
msgstr ""
-#: lib/Script/sieve.php:222
+#: lib/Script/sieve.php:229
msgid "Forward Keep Action"
msgstr ""
@@ -419,7 +419,7 @@ msgstr ""
msgid "Forward is not supported in the current filtering driver."
msgstr ""
-#: lib/Script/procmail.php:298 lib/Script/sieve.php:232
+#: lib/Script/procmail.php:298 lib/Script/sieve.php:239
#: lib/Script/maildrop.php:246
msgid "Forwards"
msgstr ""
@@ -432,11 +432,11 @@ msgstr ""
msgid "From"
msgstr ""
-#: lib/Script/sieve.php:2927
+#: lib/Script/sieve.php:2948
msgid "From:"
msgstr ""
-#: lib/Script/sieve.php:118
+#: lib/Script/sieve.php:123
msgid "Generated by Ingo (http://www.horde.org/ingo/)"
msgstr ""
@@ -452,7 +452,7 @@ msgstr ""
msgid "Individual rules are not supported in the current filtering driver."
msgstr ""
-#: lib/Script/sieve.php:2521
+#: lib/Script/sieve.php:2542
msgid "Inexistant mailbox specified for message delivery."
msgstr ""
@@ -501,7 +501,7 @@ msgstr ""
msgid "Matches (with placeholders)"
msgstr ""
-#: lib/api.php:71
+#: lib/api.php:76
msgid "Maximum Number of Rules"
msgstr ""
@@ -525,19 +525,19 @@ msgid ""
"be treated as spam."
msgstr ""
-#: lib/Script/sieve.php:2941
+#: lib/Script/sieve.php:2962
msgid "Missing address to notify"
msgstr ""
-#: lib/Script/sieve.php:2322
+#: lib/Script/sieve.php:2343
msgid "Missing address to redirect message to"
msgstr ""
-#: lib/Script/sieve.php:2368
+#: lib/Script/sieve.php:2389
msgid "Missing reason for reject"
msgstr ""
-#: lib/Script/sieve.php:2671
+#: lib/Script/sieve.php:2692
msgid "Missing reason in vacation."
msgstr ""
@@ -562,16 +562,16 @@ msgstr ""
msgid "New Rule"
msgstr ""
-#: lib/Ingo.php:230 lib/Ingo.php:232
+#: lib/Ingo.php:233 lib/Ingo.php:235
#, php-format
msgid "No \"%s\" element found in backend configuration."
msgstr ""
-#: lib/Ingo.php:223
+#: lib/Ingo.php:226
msgid "No backend configured for this host"
msgstr ""
-#: lib/Ingo.php:199
+#: lib/Ingo.php:202
msgid "No backends configured in backends.php"
msgstr ""
@@ -580,8 +580,8 @@ msgstr ""
msgid "No filters. Click \"%s\" to create a new filter."
msgstr ""
-#: lib/Script/sieve.php:1679 lib/Script/sieve.php:1828
-#: lib/Script/sieve.php:2044
+#: lib/Script/sieve.php:1692 lib/Script/sieve.php:1841
+#: lib/Script/sieve.php:2065
msgid "No headers specified"
msgstr ""
@@ -589,7 +589,7 @@ msgstr ""
msgid "No script generated."
msgstr ""
-#: lib/Script/sieve.php:2060 lib/Script/sieve.php:2144
+#: lib/Script/sieve.php:2081 lib/Script/sieve.php:2165
msgid "No strings specified"
msgstr ""
@@ -609,11 +609,11 @@ msgstr ""
msgid "Only flag the message"
msgstr ""
-#: config/prefs.php.dist:19
+#: config/prefs.php.dist:18
msgid "Options about script updating."
msgstr ""
-#: config/prefs.php.dist:17
+#: config/prefs.php.dist:16
msgid "Other Options"
msgstr ""
@@ -691,7 +691,7 @@ msgstr ""
msgid "Rule Name:"
msgstr ""
-#: lib/Script/sieve.php:2929
+#: lib/Script/sieve.php:2950
msgid "Rule:"
msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
msgid "STARTTLS failed: (%s) %s"
msgstr ""
-#: lib/Ingo.php:393
+#: lib/Ingo.php:396
msgid "S_pam"
msgstr ""
@@ -728,19 +728,19 @@ msgstr ""
msgid "Script"
msgstr ""
-#: config/prefs.php.dist:18
+#: config/prefs.php.dist:17
msgid "Script Updating"
msgstr ""
-#: lib/Ingo.php:175
+#: lib/Ingo.php:178
msgid "Script not updated."
msgstr ""
-#: lib/Ingo.php:146
+#: lib/Ingo.php:149
msgid "Script successfully activated."
msgstr ""
-#: lib/Ingo.php:145
+#: lib/Ingo.php:148
msgid "Script successfully deactivated."
msgstr ""
@@ -792,7 +792,7 @@ msgstr ""
msgid "Source (From,Reply-to,etc)"
msgstr ""
-#: filters.php:198 lib/Script/sieve.php:425 lib/Script/maildrop.php:301
+#: filters.php:198 lib/Script/sieve.php:438 lib/Script/maildrop.php:301
#: lib/Block/overview.php:105 lib/Block/overview.php:108
msgid "Spam Filter"
msgstr ""
@@ -821,29 +821,29 @@ msgstr ""
msgid "Subject of vacation message:"
msgstr ""
-#: lib/Script/sieve.php:2928
+#: lib/Script/sieve.php:2949
msgid "Subject:"
msgstr ""
-#: lib/api.php:103
+#: lib/api.php:113
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr ""
-#: lib/api.php:126
+#: lib/api.php:141
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr ""
-#: lib/Ingo.php:141
+#: lib/Ingo.php:144
msgid "The driver said: "
msgstr ""
-#: lib/Ingo.php:140
+#: lib/Ingo.php:143
msgid "There was an error activating the script."
msgstr ""
-#: lib/Ingo.php:139
+#: lib/Ingo.php:142
msgid "There was an error deactivating the script."
msgstr ""
@@ -865,7 +865,7 @@ msgid "User header"
msgstr ""
#: filters.php:186 vacation.php:151 lib/Script/procmail.php:278
-#: lib/Script/sieve.php:399 lib/Script/maildrop.php:276
+#: lib/Script/sieve.php:412 lib/Script/maildrop.php:276
#: lib/Block/overview.php:61 lib/Block/overview.php:64
msgid "Vacation"
msgstr ""
@@ -882,11 +882,11 @@ msgstr ""
msgid "Value"
msgstr ""
-#: templates/whitelist/whitelist.inc:16
+#: templates/whitelist/whitelist.inc:14
msgid "Wh_itelist addresses:"
msgstr ""
-#: filters.php:180 templates/whitelist/whitelist.inc:8
+#: filters.php:180 templates/whitelist/whitelist.inc:5
#: lib/Block/overview.php:85 lib/Block/overview.php:88
msgid "Whitelist"
msgstr ""
@@ -899,7 +899,7 @@ msgstr ""
msgid "Whitelist is not supported in the current filtering driver."
msgstr ""
-#: lib/Script/procmail.php:246 lib/Script/sieve.php:329
+#: lib/Script/procmail.php:246 lib/Script/sieve.php:336
#: lib/Script/maildrop.php:224
msgid "Whitelisted Addresses"
msgstr ""
@@ -942,15 +942,19 @@ msgstr ""
msgid "You do not have permission to edit filter rules."
msgstr ""
-#: lib/Script/sieve.php:2926
+#: lib/Script/sieve.php:2947
msgid "You have received a new message"
msgstr ""
-#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+#: lib/Script/imap.php:309 lib/Script/imap.php:334 lib/Script/imap.php:352
+msgid "[No Sender]"
+msgstr ""
+
+#: lib/Script/imap.php:308 lib/Script/imap.php:333 lib/Script/imap.php:351
msgid "[No Subject]"
msgstr ""
-#: lib/Ingo.php:384
+#: lib/Ingo.php:387
msgid "_Blacklist"
msgstr ""
@@ -962,7 +966,7 @@ msgstr ""
msgid "_Enter each address on a new line:"
msgstr ""
-#: lib/Ingo.php:390
+#: lib/Ingo.php:393
msgid "_Forward"
msgstr ""
@@ -970,19 +974,19 @@ msgstr ""
msgid "_Move message to folder:"
msgstr ""
-#: lib/Ingo.php:399
+#: lib/Ingo.php:404
msgid "_Permissions"
msgstr ""
-#: lib/Ingo.php:396
+#: lib/Ingo.php:401
msgid "_Script"
msgstr ""
-#: lib/Ingo.php:387
+#: lib/Ingo.php:390
msgid "_Vacation"
msgstr ""
-#: lib/Ingo.php:381
+#: lib/Ingo.php:384
msgid "_Whitelist"
msgstr ""
@@ -998,10 +1002,6 @@ msgstr ""
msgid "disabled - click to enable"
msgstr ""
-#: filters.php:218
-msgid "field"
-msgstr ""
-
#: lib/Block/overview.php:52
msgid "inactive"
msgstr ""
@@ -1010,10 +1010,6 @@ msgstr ""
msgid "maildrop script generated by Ingo"
msgstr ""
-#: filters.php:218
-msgid "match"
-msgstr ""
-
#: templates/rule/filter.inc:4
msgid "or"
msgstr ""
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 3bbb82d..6bcf87d 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -1,15 +1,15 @@
# Dutch translations for Ingo package
# Copyright (C) 2003: Ruben van der Steenhoven, Webmeesters
# Ruben van der Steenhoven <ingoxlate at webmeesters.net>, 2003
-# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2004-2007
+# Jan Kuipers <jrkuipers at lauwerscollege.nl>, 2004-2008
# This file is distributed under the same license as the Ingo package.
#
msgid ""
msgstr ""
-"Project-Id-Version: Ingo H3 (1.2-cvs)\n"
+"Project-Id-Version: Ingo H3 (1.2.1-cvs)\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2007-11-21 19:43+0100\n"
-"PO-Revision-Date: 2007-11-21 23:17+0100\n"
+"POT-Creation-Date: 2008-08-08 23:32+0200\n"
+"PO-Revision-Date: 2008-08-09 12:39+0200\n"
"Last-Translator: Jan Kuipers <jrkuipers at lauwerscollege.nl>\n"
"Language-Team: i18n at lists.horde.org\n"
"MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Geavanceerde instellingen"
msgid "All of the following"
msgstr "Ieder van de volgende"
-#: lib/api.php:54
+#: lib/api.php:68
msgid "Allow Rules"
msgstr "Regels toestaan"
@@ -78,7 +78,7 @@ msgstr "Filters toepassen"
msgid "Are you sure you want to delete this rule?"
msgstr "Weet u zeker dat u deze regel wilt verwijderen?"
-#: config/prefs.php.dist:33
+#: config/prefs.php.dist:32
msgid "Automatically update the script after each change?"
msgstr "Het script na iedere verandering automatisch bijwerken?"
@@ -113,8 +113,8 @@ msgid "Blacklist is not supported in the current filtering driver."
msgstr ""
"Zwarte lijst wordt niet ondersteund in het huidige filterstuurprogramma."
-#: lib/Script/maildrop.php:197 lib/Script/sieve.php:269
-#: lib/Script/procmail.php:209
+#: lib/Script/maildrop.php:197 lib/Script/sieve.php:276
+#: lib/Script/procmail.php:219
msgid "Blacklisted Addresses"
msgstr "Zwarte lijst adressen"
@@ -130,7 +130,7 @@ msgstr "Hoofdlettergevoelig"
msgid "Cc"
msgstr "Cc"
-#: blacklist.php:70 vacation.php:81 rule.php:141 forward.php:56 spam.php:90
+#: blacklist.php:70 vacation.php:81 rule.php:141 forward.php:56 spam.php:106
#: whitelist.php:38
msgid "Changes saved."
msgstr "Veranderingen opgeslagen"
@@ -148,7 +148,7 @@ msgstr "Bevat"
msgid "Copy %s"
msgstr "%s kopiëren"
-#: lib/Storage.php:992 lib/Storage/sql.php:618
+#: lib/Storage.php:993 lib/Storage/sql.php:621
#, php-format
msgid "Copy of %s"
msgstr "Kopie van %s"
@@ -162,7 +162,7 @@ msgstr "Kon het gecompileerde sjabloonbestand %s niet opslaan."
msgid "Create new folder"
msgstr "Nieuwe map maken"
-#: lib/Script/maildrop.php:362 lib/Script/procmail.php:342
+#: lib/Script/maildrop.php:362 lib/Script/procmail.php:352
msgid "DISABLED: "
msgstr "Uitgeschakeld: "
@@ -212,7 +212,7 @@ msgstr "Bestemming (Aan,Cc,Bcc,enz.)"
msgid "Disable %s"
msgstr "%s uitschakelen"
-#: vacation.php:159 forward.php:99 spam.php:149 templates/rule/header.inc:26
+#: vacation.php:153 forward.php:99 spam.php:160 templates/rule/header.inc:26
#: templates/blacklist/blacklist.inc:10 templates/whitelist/whitelist.inc:10
msgid "Disabled"
msgstr "Uitgeschakeld"
@@ -251,7 +251,7 @@ msgstr "Komt niet overeen (met placeholders)"
#: lib/Block/overview.php:63 lib/Block/overview.php:72
#: lib/Block/overview.php:87 lib/Block/overview.php:97
-#: lib/Block/overview.php:107 templates/filters/header.inc:26
+#: lib/Block/overview.php:107 templates/filters/header.inc:23
msgid "Edit"
msgstr "Bewerken"
@@ -265,7 +265,7 @@ msgstr "%s bewerken"
msgid "Enable %s"
msgstr "Activeer %s"
-#: templates/filters/header.inc:28
+#: templates/filters/header.inc:25
msgid "Enabled"
msgstr "Geactiveerd"
@@ -291,7 +291,7 @@ msgstr "Fout bij ophalen van het huidige script: (%d) %s"
msgid "Error saving changes."
msgstr "Fout bij opslaan van wijzigingen."
-#: templates/filters/header.inc:20
+#: templates/filters/header.inc:17
msgid "Existing Rules"
msgstr "Bestaande regels"
@@ -348,21 +348,21 @@ msgstr "Filterregels"
msgid "Filter Script Display"
msgstr "Filterscriptweergave"
-#: lib/Ingo.php:379
+#: lib/Ingo.php:382
msgid "Filter _Rules"
msgstr "Filter_regels"
-#: lib/Script/imap.php:348
+#: lib/Script/imap.php:357
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr "Filterbewerking: %s bericht(en) zijn gekopieerd naar map \"%s\"."
-#: lib/Script/imap.php:334
+#: lib/Script/imap.php:338
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr "Filterbewerking: %s bericht(en) zijn verwijderd."
-#: lib/Script/imap.php:312
+#: lib/Script/imap.php:314
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr "Filterbewerking: %s bericht(en) zijn verplaatst naar map \"%s\"."
@@ -374,7 +374,7 @@ msgstr ""
"Filterbewerking: %s bericht(en), die op de zwarte lijst stonden, zijn "
"verwijderd."
-#: lib/Script/imap.php:345
+#: lib/Script/imap.php:350
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
@@ -383,12 +383,12 @@ msgstr ""
"Filterbewerking: Het bericht \"%s\" van \"%s\" is naar de map \"%s\" "
"gekopieerd."
-#: lib/Script/imap.php:329
+#: lib/Script/imap.php:332
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr "Filterbewerking: Het bericht \"%s\" van \"%s\" is verwijderd."
-#: lib/Script/imap.php:306
+#: lib/Script/imap.php:307
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
@@ -418,7 +418,7 @@ msgstr "Voor een inkomend berichten dat voldoet aan:"
msgid "Forward"
msgstr "Doorsturen"
-#: lib/Script/sieve.php:222
+#: lib/Script/sieve.php:229
msgid "Forward Keep Action"
msgstr "Doorsturen bewaren bewerking"
@@ -426,8 +426,8 @@ msgstr "Doorsturen bewaren bewerking"
msgid "Forward is not supported in the current filtering driver."
msgstr "Doorsturen wordt niet ondersteund in het huidige filterstuurprogramma."
-#: lib/Script/maildrop.php:246 lib/Script/sieve.php:232
-#: lib/Script/procmail.php:288
+#: lib/Script/maildrop.php:246 lib/Script/sieve.php:239
+#: lib/Script/procmail.php:298
msgid "Forwards"
msgstr "Doorsturen"
@@ -439,11 +439,11 @@ msgstr "Doorsturen bewerken"
msgid "From"
msgstr "Van"
-#: lib/Script/sieve.php:2933
+#: lib/Script/sieve.php:2948
msgid "From:"
msgstr "Van:"
-#: lib/Script/sieve.php:118
+#: lib/Script/sieve.php:123
msgid "Generated by Ingo (http://www.horde.org/ingo/)"
msgstr "Gegenereerd door Ingo (http://www.horde.org/ingo/)"
@@ -461,7 +461,7 @@ msgstr ""
"Individuele regels worden niet ondersteund in het huidige "
"filterstuurprogramma."
-#: lib/Script/sieve.php:2527
+#: lib/Script/sieve.php:2542
msgid "Inexistant mailbox specified for message delivery."
msgstr "Niet bestaande mailbox opgegeven voor berichtaflevering."
@@ -512,7 +512,7 @@ msgstr "Overeenkomend type"
msgid "Matches (with placeholders)"
msgstr "Komt overeen (met placeholders)"
-#: lib/api.php:57
+#: lib/api.php:71
msgid "Maximum Number of Rules"
msgstr "Maximum aantal regels."
@@ -544,23 +544,23 @@ msgstr ""
"Berichten met een waarschijnlijke spamscore groter dan, of gelijk aan dit "
"getal zullen als spam worden behandeld."
-#: lib/Script/sieve.php:2947
+#: lib/Script/sieve.php:2962
msgid "Missing address to notify"
msgstr "Het adres, waar de notificatie heen moet worden gezonden, ontbreekt"
-#: lib/Script/sieve.php:2328
+#: lib/Script/sieve.php:2343
msgid "Missing address to redirect message to"
msgstr "Het adres, waar dit bericht heen moet worden doorgezonden, ontbreekt"
-#: lib/Script/sieve.php:2374
+#: lib/Script/sieve.php:2389
msgid "Missing reason for reject"
msgstr "De reden voor afwijzing ontbreekt"
-#: lib/Script/sieve.php:2677
+#: lib/Script/sieve.php:2692
msgid "Missing reason in vacation."
msgstr "De reden voor het afwezigheidbericht werd niet opgegeven"
-#: templates/filters/header.inc:32
+#: templates/filters/header.inc:29
msgid "Move"
msgstr "Verplaatsen"
@@ -576,21 +576,21 @@ msgstr "Regel naar boven verschuiven"
msgid "My email addresses:"
msgstr "Mijn e-mailadressen:"
-#: lib/Storage.php:888 templates/filters/filter-none.inc:3
+#: lib/Storage.php:889 templates/filters/filter-none.inc:3
#: templates/filters/footer.inc:6
msgid "New Rule"
msgstr "Nieuwe Regel"
-#: lib/Ingo.php:230 lib/Ingo.php:232
+#: lib/Ingo.php:233 lib/Ingo.php:235
#, php-format
msgid "No \"%s\" element found in backend configuration."
msgstr "Geen \"%s\" element in de backendconfiguratie gevonden."
-#: lib/Ingo.php:223
+#: lib/Ingo.php:226
msgid "No backend configured for this host"
msgstr "Geen Backendconfiguratie voor deze Host opgegeven"
-#: lib/Ingo.php:199
+#: lib/Ingo.php:202
msgid "No backends configured in backends.php"
msgstr "Geen backends geconfigureerd in backends.php"
@@ -599,8 +599,8 @@ msgstr "Geen backends geconfigureerd in backends.php"
msgid "No filters. Click \"%s\" to create a new filter."
msgstr "Geen filters. Klik op \"%s\", om een nieuw filter te maken."
-#: lib/Script/sieve.php:1685 lib/Script/sieve.php:1834
-#: lib/Script/sieve.php:2050
+#: lib/Script/sieve.php:1692 lib/Script/sieve.php:1841
+#: lib/Script/sieve.php:2065
msgid "No headers specified"
msgstr "Geen headers opgegeven"
@@ -608,7 +608,7 @@ msgstr "Geen headers opgegeven"
msgid "No script generated."
msgstr "Script niet gemaakt."
-#: lib/Script/sieve.php:2066 lib/Script/sieve.php:2150
+#: lib/Script/sieve.php:2081 lib/Script/sieve.php:2165
msgid "No strings specified"
msgstr "Geen tekst opgegeven"
@@ -628,11 +628,11 @@ msgstr "Aantal dagen tussen afwezigheidsantwoorden:"
msgid "Only flag the message"
msgstr "Alleen het bericht markeren"
-#: config/prefs.php.dist:19
+#: config/prefs.php.dist:18
msgid "Options about script updating."
msgstr "Opties mbt scripts bijwerken."
-#: config/prefs.php.dist:17
+#: config/prefs.php.dist:16
msgid "Other Options"
msgstr "Andere opties"
@@ -681,12 +681,12 @@ msgid "Return to Filters List"
msgstr "Terug naar filterlijst"
#: vacation.php:34 vacation.php:117 forward.php:34 forward.php:88 spam.php:62
-#: spam.php:130 templates/blacklist/blacklist.inc:42
+#: spam.php:141 templates/blacklist/blacklist.inc:42
#: templates/whitelist/whitelist.inc:24
msgid "Return to Rules List"
msgstr "Terug naar regellijst"
-#: templates/filters/header.inc:27
+#: templates/filters/header.inc:24
msgid "Rule"
msgstr "Regel"
@@ -698,11 +698,11 @@ msgstr "Regel gecopieerd"
msgid "Rule Deleted"
msgstr "Regel gewist"
-#: filters.php:94 vacation.php:97 forward.php:72 spam.php:106
+#: filters.php:94 vacation.php:97 forward.php:72 spam.php:122
msgid "Rule Disabled"
msgstr "Regel uitgeschakeld"
-#: filters.php:99 vacation.php:88 forward.php:63 spam.php:97
+#: filters.php:99 vacation.php:88 forward.php:63 spam.php:113
msgid "Rule Enabled"
msgstr "Regel ingeschakeld"
@@ -710,7 +710,7 @@ msgstr "Regel ingeschakeld"
msgid "Rule Name:"
msgstr "Regelnaam:"
-#: lib/Script/sieve.php:2935
+#: lib/Script/sieve.php:2950
msgid "Rule:"
msgstr "Regel:"
@@ -719,7 +719,7 @@ msgstr "Regel:"
msgid "STARTTLS failed: (%s) %s"
msgstr "STARTTLS mislukt: (%s) %s"
-#: lib/Ingo.php:393
+#: lib/Ingo.php:396
msgid "S_pam"
msgstr "S_pam"
@@ -732,13 +732,13 @@ msgstr "Opslaan"
msgid "Save Settings"
msgstr "Instellingen opslaan"
-#: vacation.php:91 vacation.php:113 forward.php:66 forward.php:84 spam.php:100
-#: spam.php:126
+#: vacation.php:91 vacation.php:113 forward.php:66 forward.php:84 spam.php:116
+#: spam.php:137
msgid "Save and Disable"
msgstr "Opslaan en uitschakelen"
-#: vacation.php:82 vacation.php:115 forward.php:57 forward.php:86 spam.php:91
-#: spam.php:128
+#: vacation.php:82 vacation.php:115 forward.php:57 forward.php:86 spam.php:107
+#: spam.php:139
msgid "Save and Enable"
msgstr "Opslaan en inschakelen"
@@ -746,19 +746,19 @@ msgstr "Opslaan en inschakelen"
msgid "Script"
msgstr "Script"
-#: config/prefs.php.dist:18
+#: config/prefs.php.dist:17
msgid "Script Updating"
msgstr "Script-bijwerken"
-#: lib/Ingo.php:175
+#: lib/Ingo.php:178
msgid "Script not updated."
msgstr "Script niet bijgewerkt."
-#: lib/Ingo.php:146
+#: lib/Ingo.php:149
msgid "Script successfully activated."
msgstr "Script succesvol geactiveerd."
-#: lib/Ingo.php:145
+#: lib/Ingo.php:148
msgid "Script successfully deactivated."
msgstr "Script succesvol gedeactiveerd."
@@ -812,12 +812,12 @@ msgstr "Grootte"
msgid "Source (From,Reply-to,etc)"
msgstr "Bron (Van,Antwoord-aan,enz.)"
-#: filters.php:198 lib/Script/maildrop.php:301 lib/Script/sieve.php:431
+#: filters.php:198 lib/Script/maildrop.php:301 lib/Script/sieve.php:438
#: lib/Block/overview.php:105 lib/Block/overview.php:108
msgid "Spam Filter"
msgstr "Spamfilter"
-#: spam.php:147 spam.php:154
+#: spam.php:158 spam.php:165
msgid "Spam Filtering"
msgstr "Spamfiltering"
@@ -841,29 +841,29 @@ msgstr "Onderwerp"
msgid "Subject of vacation message:"
msgstr "Onderwerp van het vakantiebericht:"
-#: lib/Script/sieve.php:2934
+#: lib/Script/sieve.php:2949
msgid "Subject:"
msgstr "Onderwerp:"
-#: lib/api.php:89
+#: lib/api.php:103
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr "Het adres \"%s\" is aan uw zwarte lijst toegevoegd."
-#: lib/api.php:112
+#: lib/api.php:126
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr "Het adres \"%s\" is aan uw witte list toegevoegd."
-#: lib/Ingo.php:141
+#: lib/Ingo.php:144
msgid "The driver said: "
msgstr "Het stuurprogramma meldt: "
-#: lib/Ingo.php:140
+#: lib/Ingo.php:143
msgid "There was an error activating the script."
msgstr "Er was een fout bij het activeren van het script."
-#: lib/Ingo.php:139
+#: lib/Ingo.php:142
msgid "There was an error deactivating the script."
msgstr "Er was een fout bij het deactiveren van het script."
@@ -884,13 +884,13 @@ msgstr "Niet in staat om de definitie van %s te laden."
msgid "User header"
msgstr "Gebruiker kop"
-#: filters.php:186 vacation.php:157 lib/Script/maildrop.php:276
-#: lib/Script/sieve.php:405 lib/Script/procmail.php:268
+#: filters.php:186 vacation.php:151 lib/Script/maildrop.php:276
+#: lib/Script/sieve.php:412 lib/Script/procmail.php:278
#: lib/Block/overview.php:61 lib/Block/overview.php:64
msgid "Vacation"
msgstr "Afwezigheid"
-#: vacation.php:164
+#: vacation.php:158
msgid "Vacation Edit"
msgstr "Afwezigheid bewerken"
@@ -920,8 +920,8 @@ msgid "Whitelist is not supported in the current filtering driver."
msgstr ""
"Witte lijst wordt niet ondersteund in het huidige filterstuurprogramma."
-#: lib/Script/maildrop.php:224 lib/Script/sieve.php:329
-#: lib/Script/procmail.php:236
+#: lib/Script/maildrop.php:224 lib/Script/sieve.php:336
+#: lib/Script/procmail.php:246
msgid "Whitelisted Addresses"
msgstr "Witte lijst adressen"
@@ -964,15 +964,19 @@ msgstr "U heeft geen recht om filterregels te verwijderen."
msgid "You do not have permission to edit filter rules."
msgstr "U heeft geen recht om filterregels te bewerken."
-#: lib/Script/sieve.php:2932
+#: lib/Script/sieve.php:2947
msgid "You have received a new message"
msgstr "U heeft een nieuw bericht ontvangen"
-#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+#: lib/Script/imap.php:309 lib/Script/imap.php:334 lib/Script/imap.php:352
+msgid "[No Sender]"
+msgstr "[Geen afzender]"
+
+#: lib/Script/imap.php:308 lib/Script/imap.php:333 lib/Script/imap.php:351
msgid "[No Subject]"
msgstr "[Geen onderwerp]"
-#: lib/Ingo.php:384
+#: lib/Ingo.php:387
msgid "_Blacklist"
msgstr "Z_warte lijst"
@@ -984,7 +988,7 @@ msgstr "Bericht volledig _wissen"
msgid "_Enter each address on a new line:"
msgstr "Plaats _ieder adres op een nieuwe regel"
-#: lib/Ingo.php:390
+#: lib/Ingo.php:393
msgid "_Forward"
msgstr "_Doorsturen"
@@ -992,19 +996,19 @@ msgstr "_Doorsturen"
msgid "_Move message to folder:"
msgstr "Bericht naar deze map _verplaatsen:"
-#: lib/Ingo.php:399
+#: lib/Ingo.php:402
msgid "_Permissions"
msgstr "_Rechten"
-#: lib/Ingo.php:396
+#: lib/Ingo.php:399
msgid "_Script"
msgstr "_Script"
-#: lib/Ingo.php:387
+#: lib/Ingo.php:390
msgid "_Vacation"
msgstr "_Vakantie"
-#: lib/Ingo.php:381
+#: lib/Ingo.php:384
msgid "_Whitelist"
msgstr "Witte li_jst"
@@ -1040,6 +1044,6 @@ msgstr "overeenkomend met"
msgid "or"
msgstr "of"
-#: lib/Script/procmail.php:130
+#: lib/Script/procmail.php:140
msgid "procmail script generated by Ingo"
msgstr "procmailscript gegenereerd door Ingo"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index acc1224..fcd656f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,31 +1,32 @@
-# translation of ingo.po to Brazilian Portuguese
+# translation of pt_BR.po to Português brasileiro
# This file is distributed under the same license as the Ingo package.
# Copyright (C) YEAR Horde Project.
-# Fabio Gomes <flgoms at uol.com.br>, 2005.
#
+# Fabio Gomes <flgoms at uol.com.br>, 2005.
+# Luis Felipe Marzagao <duli at fedoraproject.org>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: ingo\n"
+"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: dev at lists.horde.org\n"
-"POT-Creation-Date: 2005-01-25 18:46+0100\n"
-"PO-Revision-Date: 2005-03-17 10:49-0300\n"
-"Last-Translator: Fabio Gomes <flgoms at uol.com.br>\n"
-"Language-Team: Brazilian Portuguese <i18n at lists.horde.org>\n"
+"POT-Creation-Date: 2008-08-31 21:27-0300\n"
+"PO-Revision-Date: 2008-07-06 23:31-0300\n"
+"Last-Translator: Luis Felipe Marzagao <duli at fedoraproject.org>\n"
+"Language-Team: Português brasileiro <i18n at lists.horde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3.1\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: filters.php:167
+#: filters.php:223
msgid " and"
msgstr " e"
-#: filters.php:167
+#: filters.php:223
msgid " or"
msgstr " ou"
-#: templates/blacklist/blacklist.inc:19
+#: templates/blacklist/blacklist.inc:17
msgid "Action for blacklisted addresses:"
msgstr "Ação para endereços na lista negra:"
@@ -33,27 +34,48 @@ msgstr "A
msgid "Activate Script"
msgstr "Ativar Rotina"
-#: templates/filters/settings.inc:9
+#: lib/Driver/ldap.php:229
+#, php-format
+msgid "Activating the script for \"%s\" failed: (%d) %s"
+msgstr "A ativação para o script \"%s\" falhou: (%d) %s"
+
+#: templates/filters/settings.inc:8
msgid "Additional Settings"
msgstr "Configurações Adicionais"
-#: templates/rule/header.inc:53
+#: forward.php:43
+msgid "Address(es) to forward to:"
+msgstr "Address(es) to forward to:"
+
+#: vacation.php:56
+msgid "Addresses to not send responses to:"
+msgstr "Endereços para não enviar respostas:"
+
+#: vacation.php:50
+msgid "Advanced Settings"
+msgstr "Configurações Avançadas"
+
+#: templates/rule/header.inc:44
msgid "All of the following"
msgstr "Todos os seguintes"
-#: templates/rule/footer.inc:44
+#: lib/api.php:68
+msgid "Allow Rules"
+msgstr "Permitir Regras"
+
+#: templates/rule/footer.inc:34
msgid "Answered"
msgstr "Respondida"
-#: templates/rule/header.inc:56
+#: templates/rule/header.inc:45
msgid "Any of the following"
msgstr "Qualquer um dos seguintes"
-#: templates/filters/footer.inc:16
+#: templates/filters/footer.inc:8
msgid "Apply Filters"
msgstr "Aplicar Filtros"
-#: filters.php:196
+#: filters.php:252
msgid "Are you sure you want to delete this rule?"
msgstr "Você tem certeza que quer excluir esta regra?"
@@ -61,39 +83,46 @@ msgstr "Voc
msgid "Automatically update the script after each change?"
msgstr "Atualizar automaticamente a rotina depois de cada alteração?"
+#: vacation.php:41
+msgid "Basic Settings"
+msgstr "Configurações Básicas"
+
#: config/fields.php.dist:47
msgid "Bcc"
msgstr "Cco"
-#: lib/Storage.php:349
+#: lib/Storage.php:346
msgid "Begins with"
msgstr "Começa com"
-#: filters.php:126 templates/blacklist/blacklist.inc:8
+#: lib/Driver/ldap.php:106 lib/Driver/ldap.php:111
+#, php-format
+msgid "Bind failed: (%s) %s"
+msgstr "A conexão falhou: (%s) %s"
+
+#: filters.php:174 lib/Block/overview.php:95 lib/Block/overview.php:98
+#: templates/blacklist/blacklist.inc:7
msgid "Blacklist"
msgstr "Lista Negra"
-#: blacklist.php:100
+#: blacklist.php:104
msgid "Blacklist Edit"
msgstr "Editar Lista Negra"
-#: blacklist.php:17
+#: blacklist.php:19
msgid "Blacklist is not supported in the current filtering driver."
msgstr "Lista Negra não é suportada pelo driver de filtro atual."
-#: lib/Script/procmail.php:209
-msgid "Blacklisted Address"
-msgstr "Endereço na Lista Negra"
-
-#: lib/Script/sieve.php:245
+#: lib/Script/sieve.php:269 lib/Script/maildrop.php:197
+#: lib/Script/procmail.php:219
msgid "Blacklisted Addresses"
msgstr "Endereços na Lista Negra"
-#: config/fields.php.dist:88
+#: config/fields.php.dist:100
msgid "Body"
msgstr "Corpo"
-#: filters.php:164 rule.php:238
+#: filters.php:220 rule.php:322
msgid "Case Sensitive"
msgstr "Sensível à Caixa"
@@ -101,34 +130,39 @@ msgstr "Sens
msgid "Cc"
msgstr "Cc"
-#: rule.php:105 whitelist.php:36 forward.php:33 vacation.php:41
-#: blacklist.php:69
+#: blacklist.php:70 vacation.php:81 whitelist.php:38 forward.php:56
+#: rule.php:141 spam.php:106
msgid "Changes saved."
-msgstr "Alterações salvas."
+msgstr "Alterações gravadas."
-#: lib/Storage.php:345
+#: lib/Driver/ldap.php:73
+msgid "Connection failure"
+msgstr "Falha de conexão"
+
+#: lib/Storage.php:342
msgid "Contains"
msgstr "Contém"
-#: filters.php:204 filters.php:205
+#: filters.php:263 filters.php:264
#, php-format
msgid "Copy %s"
msgstr "Copiar %s"
-#: lib/Storage.php:775
+#: lib/Storage.php:993 lib/Storage/sql.php:621
#, php-format
msgid "Copy of %s"
msgstr "Copiar de %s"
-#: lib/Ingo.php:53
+#: lib/Template.php:235
+#, php-format
+msgid "Could not save the compiled template file '%s'."
+msgstr "Não foi possível gravar o arquivo de modelo compilado '%s'."
+
+#: lib/Ingo.php:62
msgid "Create new folder"
msgstr "Criar nova pasta"
-#: templates/filters/filter.html:16
-msgid "DISABLED"
-msgstr "DESATIVADA"
-
-#: lib/Script/procmail.php:354
+#: lib/Script/maildrop.php:362 lib/Script/procmail.php:352
msgid "DISABLED: "
msgstr "DESATIVADA: "
@@ -136,171 +170,212 @@ msgstr "DESATIVADA: "
msgid "Deactivate Script"
msgstr "Desativar Rotina"
-#: filters.php:196 filters.php:197
+#: filters.php:252 filters.php:253
#, php-format
msgid "Delete %s"
msgstr "Excluir %s"
-#: templates/rule/filter.inc:30
+#: templates/rule/filter.inc:33
msgid "Delete Condition"
msgstr "Excluir Condição"
-#: lib/Storage.php:301
+#: lib/Storage.php:290
msgid "Delete message completely"
msgstr "Excluir mensagem completamente"
-#: templates/rule/footer.inc:47
+#: templates/rule/footer.inc:36
msgid "Deleted"
msgstr "Excluída"
-#: lib/Storage.php:289
-msgid "Deliver into my INBOX"
+#: lib/Storage.php:278
+msgid "Deliver into my Inbox"
msgstr "Entregar em minha Caixa de Entrada"
-#: lib/Storage.php:315
-msgid "Deliver into my INBOX and copy to"
+#: lib/Storage.php:304
+msgid "Deliver into my Inbox and copy to"
msgstr "Entregar em minha Caixa de Entrada e copiar para"
-#: lib/Storage.php:310
-msgid "Deliver into my INBOX and redirect to"
+#: lib/Storage.php:299
+msgid "Deliver into my Inbox and redirect to"
msgstr "Entregar em minha Caixa de Entrada e redirecionar para"
-#: lib/Storage.php:295
+#: lib/Storage.php:284
msgid "Deliver to folder"
msgstr "Entregar na pasta"
-#: filters.php:218 filters.php:219
+#: config/fields.php.dist:83
+msgid "Destination (To,Cc,Bcc,etc)"
+msgstr "Destino (Para,Cc,Cco,etc)"
+
+#: filters.php:277 filters.php:278
#, php-format
msgid "Disable %s"
msgstr "Desativar %s "
-#: templates/whitelist/whitelist.inc:9 templates/blacklist/blacklist.inc:10
-#: templates/vacation/vacation.inc:9 templates/forward/forward.inc:9
-#: templates/rule/header.inc:30
+#: vacation.php:153 forward.php:99 spam.php:160
+#: templates/blacklist/blacklist.inc:10 templates/rule/header.inc:26
+#: templates/whitelist/whitelist.inc:10
msgid "Disabled"
msgstr "Desativado"
-#: templates/filters/settings.inc:21
+#: templates/filters/settings.inc:15
msgid "Display detailed notification when each filter is applied?"
msgstr "Exibir notificação detalhada quando cada filtro for aplicado?"
-#: templates/vacation/vacation.inc:38
-msgid "Do _not send responses to bulk or list messages"
-msgstr "_Não enviar respostas para mensagens em massa ou listas de mensagens"
+#: vacation.php:58
+msgid "Do not send responses to bulk or list messages?"
+msgstr "Não enviar respostas para mensagens spam ou de listas?"
#: templates/rule/footer.inc:10
msgid "Do this:"
msgstr "Faça isto:"
-#: lib/Storage.php:350
+#: lib/Storage.php:347
msgid "Doesn't begin with"
msgstr "Não começa com"
-#: lib/Storage.php:346
+#: lib/Storage.php:343
msgid "Doesn't contain"
msgstr "Não contém"
-#: lib/Storage.php:352
+#: lib/Storage.php:349
msgid "Doesn't end with"
msgstr "Não termina com"
-#: lib/Storage.php:354
+#: lib/Storage.php:351
msgid "Doesn't exist"
msgstr "Não existe"
-#: lib/Storage.php:357
+#: lib/Storage.php:354
msgid "Doesn't match (with placeholders)"
msgstr "Não corresponde a (com coringas)"
-#: templates/filters/header.inc:20
+#: lib/Block/overview.php:63 lib/Block/overview.php:72
+#: lib/Block/overview.php:87 lib/Block/overview.php:97
+#: lib/Block/overview.php:107 templates/filters/header.inc:23
msgid "Edit"
msgstr "Editar"
-#: filters.php:185 filters.php:187 filters.php:191 filters.php:192
+#: filters.php:241 filters.php:243 filters.php:247 filters.php:248
#, php-format
msgid "Edit %s"
msgstr "Editar %s"
-#: filters.php:222 filters.php:223
+#: filters.php:287 filters.php:288
#, php-format
msgid "Enable %s"
msgstr "Ativar %s"
-#: templates/filters/header.inc:22
+#: templates/filters/header.inc:25
msgid "Enabled"
msgstr "Ativado"
-#: lib/Storage.php:351
+#: vacation.php:45
+msgid "End of vacation:"
+msgstr "Fim das férias:"
+
+#: lib/Storage.php:348
msgid "Ends with"
msgstr "Termina com"
-#: lib/Storage.php:362
+#: lib/Storage.php:359
msgid "Equal to"
msgstr "Igual a"
-#: templates/filters/header.inc:7
+#: lib/Driver/ldap.php:138 lib/Driver/ldap.php:148 lib/Driver/ldap.php:157
+#: lib/Driver/ldap.php:167
+#, php-format
+msgid "Error retrieving current script: (%d) %s"
+msgstr "Erro ao obter o script atual: (%d) %s"
+
+#: blacklist.php:68
+msgid "Error saving changes."
+msgstr "Erro ao gravar alterações."
+
+#: templates/filters/header.inc:17
msgid "Existing Rules"
msgstr "Regras Existentes"
-#: lib/Storage.php:353
+#: lib/Storage.php:350
msgid "Exists"
msgstr "Existe"
-#: templates/filters/settings.inc:30
+#: lib/Driver/ldap.php:143
+#, php-format
+msgid "Expected 1 object, got %d."
+msgstr "1 objeto esperado, obtidos %d."
+
+#: lib/Driver/sivtest.php:204
+msgid "Failed to read from socket: "
+msgstr "Erro ao ler do socket: "
+
+#: lib/Driver/sivtest.php:199
+msgid "Failed to write to socket: "
+msgstr "Erro ao gravar para o socket: "
+
+#: lib/Driver/sivtest.php:194
+msgid "Failed to write to socket: (connection lost!)"
+msgstr "Erro ao gravar para o socket: (conexão perdida!)"
+
+#: templates/rule/filter.inc:10
+msgid "Field"
+msgstr "Campo"
+
+#: templates/filters/settings.inc:22
msgid "Filter All Messages"
msgstr "Filtrar Todas Mensagens"
-#: templates/filters/settings.inc:32
+#: templates/filters/settings.inc:24
msgid "Filter Only Seen Messages"
msgstr "Filtrar Somente Mensagens Lidas"
-#: templates/filters/settings.inc:31
+#: templates/filters/settings.inc:23
msgid "Filter Only Unseen Messages"
msgstr "Filtrar Somente Mensagens Não Lidas"
-#: templates/filters/settings.inc:28
+#: templates/filters/settings.inc:20
msgid "Filter Options"
msgstr "Opções de Filtro"
-#: templates/rule/header.inc:28
+#: templates/rule/header.inc:25
msgid "Filter Rule"
msgstr "Regra do Filtro"
-#: filters.php:92
+#: filters.php:139
msgid "Filter Rules"
msgstr "Regras de Filtro"
-#: script.php:52
+#: script.php:54
msgid "Filter Script Display"
msgstr "Exibição da Rotina do Filtro"
-#: lib/Ingo.php:269
+#: lib/Ingo.php:379
msgid "Filter _Rules"
msgstr "_Regras de Filtro"
-#: lib/Script/imap.php:321
+#: lib/Script/imap.php:348
#, php-format
msgid "Filter activity: %s message(s) have been copied to the folder \"%s\"."
msgstr "Atividade do Filtro: %s mensagem(ns) copiada(s) para a pasta \"%s\"."
-#: lib/Script/imap.php:308
+#: lib/Script/imap.php:334
#, php-format
msgid "Filter activity: %s message(s) have been deleted."
msgstr "Atividade do Filtro: %s mensagem(ns) excluída(s)."
-#: lib/Script/imap.php:286
+#: lib/Script/imap.php:312
#, php-format
msgid "Filter activity: %s message(s) have been moved to the folder \"%s\"."
msgstr "Atividade do Filtro: %s mensagem(ns) movida(s) para a pasta \"%s\"."
-#: lib/Script/imap.php:189
+#: lib/Script/imap.php:206
#, php-format
msgid "Filter activity: %s message(s) that matched the blacklist were deleted."
msgstr ""
"Atividade do Filtro: %s mensagem(ns) que correspondeu(ram) a lista negra foi"
"(ram) excluída(s)."
-#: lib/Script/imap.php:318
+#: lib/Script/imap.php:345
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been copied to the "
@@ -309,12 +384,12 @@ msgstr ""
"Atividade do filtro: A mensagem \"%s\" de \"%s\" foi copiada para a pasta \"%"
"s\"."
-#: lib/Script/imap.php:303
+#: lib/Script/imap.php:329
#, php-format
msgid "Filter activity: The message \"%s\" from \"%s\" has been deleted."
msgstr "Atividade do Filtro: A mensagem \"%s\" de \"%s\" foi excluída."
-#: lib/Script/imap.php:280
+#: lib/Script/imap.php:306
#, php-format
msgid ""
"Filter activity: The message \"%s\" from \"%s\" has been moved to the folder "
@@ -323,27 +398,41 @@ msgstr ""
"Atividade do Filtro: A mensagem \"%s\" de \"%s\"foi movida para a pasta \"%s"
"\"."
-#: rule.php:133
+#: rule.php:188
msgid "Filter not found."
msgstr "Filtro não encontrado."
-#: templates/rule/header.inc:48
+#: templates/rule/footer.inc:32
+msgid "Flagged For Followup"
+msgstr "Marcada para Acompanhamento"
+
+#: spam.php:74
+msgid "Folder to receive spam:"
+msgstr "Pasta para receber spam:"
+
+#: templates/rule/header.inc:42
msgid "For an incoming message that matches:"
msgstr "Para uma nova mensagem que corresponda:"
-#: filters.php:144 templates/forward/forward.inc:7
+#: filters.php:192 forward.php:97 lib/Block/overview.php:71
+#: lib/Block/overview.php:73
msgid "Forward"
msgstr "Encaminhar"
-#: forward.php:16
+#: lib/Script/sieve.php:222
+msgid "Forward Keep Action"
+msgstr "Encaminhar Manter Ação"
+
+#: forward.php:18
msgid "Forward is not supported in the current filtering driver."
msgstr "Encaminhamento não é suportado pelo driver de filtro atual."
-#: lib/Script/procmail.php:296
+#: lib/Script/sieve.php:232 lib/Script/maildrop.php:246
+#: lib/Script/procmail.php:298
msgid "Forwards"
msgstr "Redirecionamentos"
-#: forward.php:46
+#: forward.php:104
msgid "Forwards Edit"
msgstr "Editar Redirecionamentos"
@@ -351,39 +440,54 @@ msgstr "Editar Redirecionamentos"
msgid "From"
msgstr "De"
-#: lib/Storage.php:360
+#: lib/Script/sieve.php:2927
+msgid "From:"
+msgstr "De:"
+
+#: lib/Script/sieve.php:118
+msgid "Generated by Ingo (http://www.horde.org/ingo/)"
+msgstr "Gerado pelo Ingo (http://www.horde.org/ingo/)"
+
+#: lib/Storage.php:357
msgid "Greater than"
msgstr "Maior que"
-#: lib/Storage.php:361
+#: lib/Storage.php:358
msgid "Greater than or equal to"
msgstr "Maior ou igual a"
-#: templates/rule/footer.inc:41
-msgid "Important"
-msgstr "Importante"
-
-#: rule.php:26
+#: rule.php:38
msgid "Individual rules are not supported in the current filtering driver."
msgstr "Regras individuais não são suportadas pelo driver de filtro atual."
-#: lib/Script/sieve.php:1848
+#: lib/Script/sieve.php:2521
msgid "Inexistant mailbox specified for message delivery."
msgstr "Pasta especificada para entrega não existe."
-#: lib/Storage.php:347
+#: lib/Storage.php:344
msgid "Is"
msgstr "É"
-#: lib/Storage.php:348
+#: lib/Storage.php:345
msgid "Isn't"
msgstr "Não é"
-#: lib/Storage.php:358
+#: forward.php:41
+msgid "Keep a copy of messages in this account?"
+msgstr "Manter uma cópia das mensagens nesta conta?"
+
+#: lib/Driver/ldap.php:23
+msgid ""
+"LDAP support is required but the LDAP module is not available or not loaded."
+msgstr ""
+"É obrigatório suporte a LDAP mas o módulo LDAP não está disponível ou não "
+"foi carregado."
+
+#: lib/Storage.php:355
msgid "Less than"
msgstr "Menor que"
-#: lib/Storage.php:359
+#: lib/Storage.php:356
msgid "Less than or equal to"
msgstr "Menor ou igual a"
@@ -391,19 +495,27 @@ msgstr "Menor ou igual a"
msgid "List-ID"
msgstr "List-ID"
-#: templates/blacklist/blacklist.inc:22
+#: templates/blacklist/blacklist.inc:20
msgid "Mar_k message as deleted"
msgstr "Mar_car mensagem como excluída"
-#: templates/rule/footer.inc:33
+#: templates/rule/footer.inc:25
msgid "Mark message as:"
msgstr "Marcar mensagem como:"
-#: lib/Storage.php:356
+#: templates/rule/filter.inc:23
+msgid "Match type"
+msgstr "Coincidir tipo"
+
+#: lib/Storage.php:353
msgid "Matches (with placeholders)"
msgstr "Corresponde a (com coringas)"
-#: lib/Storage.php:487
+#: lib/api.php:71
+msgid "Maximum Number of Rules"
+msgstr "Número Máximo de Regras"
+
+#: lib/Storage.php:507
#, php-format
msgid ""
"Maximum number of blacklisted addresses exceeded (Total addresses: %s, "
@@ -413,7 +525,7 @@ msgstr ""
"Máximo de endereços: %s). Não consegui adicionar novos endereços à lista "
"negra."
-#: lib/Storage.php:541
+#: lib/Storage.php:560
#, php-format
msgid ""
"Maximum number of whitelisted addresses exceeded (Total addresses: %s, "
@@ -423,74 +535,98 @@ msgstr ""
"s, Máximo de endereços: %s). Não consegui adicionar novos endereços à lista "
"branca."
-#: lib/Script/sieve.php:1711
+#: spam.php:71
+msgid ""
+"Messages with a likely spam score greater than or equal to this number will "
+"be treated as spam."
+msgstr ""
+"Mensagens com um índice de spam maior ou igual a esse número serão tratadas "
+"como spam."
+
+#: lib/Script/sieve.php:2941
+msgid "Missing address to notify"
+msgstr "Endereço para notificar ausente"
+
+#: lib/Script/sieve.php:2322
msgid "Missing address to redirect message to"
msgstr "Endereço para redirecionamento não informado"
-#: lib/Script/sieve.php:1745
+#: lib/Script/sieve.php:2368
msgid "Missing reason for reject"
msgstr "Razão para rejeição não informada"
-#: lib/Script/sieve.php:1915
+#: lib/Script/sieve.php:2671
msgid "Missing reason in vacation."
msgstr "Razão para mensagem de férias não informada."
-#: templates/filters/header.inc:23
+#: templates/filters/header.inc:29
msgid "Move"
msgstr "Mover"
-#: filters.php:109 filters.php:215
+#: filters.php:156 filters.php:273
msgid "Move Rule Down"
msgstr "Mover Regra Abaixo"
-#: filters.php:110 filters.php:214
+#: filters.php:157 filters.php:272
msgid "Move Rule Up"
msgstr "Mover Regra Acima"
-#: templates/vacation/vacation.inc:46
-msgid "N_umber of days between vacation replies:"
-msgstr "_Número de dias entre as respostas de férias:"
+#: vacation.php:53
+msgid "My email addresses:"
+msgstr "Meus endereços de e-mail:"
-#: templates/filters/filter-none.inc:4 templates/filters/footer.inc:13
-#: lib/Storage.php:726
+#: lib/Storage.php:889 templates/filters/footer.inc:6
+#: templates/filters/filter-none.inc:3
msgid "New Rule"
msgstr "Nova Regra"
-#: lib/Ingo.php:204 lib/Ingo.php:206
+#: lib/Ingo.php:230 lib/Ingo.php:232
#, php-format
-msgid "No '%s' element found in backend configuration."
-msgstr "O parâmetro '%s' não foi encontrado na configuração do driver."
+msgid "No \"%s\" element found in backend configuration."
+msgstr "Nenhum elemento \"%s\" encontrado na configuração da estrutura."
-#: lib/Ingo.php:202
+#: lib/Ingo.php:223
msgid "No backend configured for this host"
msgstr "Não foi configurado um driver para este servidor"
-#: lib/Ingo.php:179
+#: lib/Ingo.php:199
msgid "No backends configured in backends.php"
msgstr "Nenhum driver configurado em backends.php"
-#: templates/filters/filter-none.inc:4
+#: templates/filters/filter-none.inc:3
#, php-format
-msgid "No filters. Click '%s' to create a new filter."
-msgstr "Nenhum filtro. Clique em '%s' para criar um novo filtro."
+msgid "No filters. Click \"%s\" to create a new filter."
+msgstr "Nenhum filtro. Clique em \"%s\" para criar um novo filtro."
-#: lib/Script/sieve.php:1298 lib/Script/sieve.php:1398
-#: lib/Script/sieve.php:1580
+#: lib/Script/sieve.php:1679 lib/Script/sieve.php:1828
+#: lib/Script/sieve.php:2044
msgid "No headers specified"
msgstr "Nenhum cabeçalho especificado"
-#: script.php:67
+#: script.php:69
msgid "No script generated."
msgstr "Nenhuma rotina gerada."
-#: lib/Script/sieve.php:1595
+#: lib/Script/sieve.php:2060 lib/Script/sieve.php:2144
msgid "No strings specified"
msgstr "Nenhuma string especificada"
-#: lib/Storage.php:363
+#: lib/Storage.php:360
msgid "Not equal to"
msgstr "Diferente de"
+#: lib/Storage.php:320
+msgid "Notify email address"
+msgstr "Endereços de e-mail de notificação:"
+
+#: vacation.php:60
+msgid "Number of days between vacation replies:"
+msgstr "Número de dias entre as respostas de férias:"
+
+#: lib/Storage.php:314
+msgid "Only flag the message"
+msgstr "Somente marcar a mensagem"
+
#: config/prefs.php.dist:19
msgid "Options about script updating."
msgstr "Opções sobre atualização da rotina."
@@ -499,82 +635,114 @@ msgstr "Op
msgid "Other Options"
msgstr "Outras Opções"
-#: templates/javascript/new_folder.js:6
+#: lib/Block/overview.php:3
+msgid "Overview"
+msgstr "Visão geral"
+
+#: config/fields.php.dist:91
+msgid "Participant (From,To,etc)"
+msgstr "Participante (De,Para,etc)"
+
+#: templates/javascript/new_folder.js:7
msgid "Please enter the name of the new folder:"
msgstr "Por favor forneça o nome para a nova pasta:"
-#: templates/vacation/vacation.inc:64
-msgid "R_eason"
-msgstr "R_azão"
+#: vacation.php:48
+msgid "Reason:"
+msgstr "Razão:"
#: config/fields.php.dist:63
msgid "Received"
-msgstr "Received"
+msgstr "Recebido"
-#: lib/Storage.php:306
+#: lib/Storage.php:295
msgid "Redirect to"
msgstr "Redirecionar para"
-#: lib/Storage.php:355
+#: lib/Storage.php:352
msgid "Regular expression"
msgstr "Expressão regular"
-#: lib/Storage.php:321
+#: lib/Storage.php:310
msgid "Reject with reason"
msgstr "Rejeitar com a razão"
-#: config/fields.php.dist:55
-msgid "Resent To"
-msgstr "Resent To"
-
#: config/fields.php.dist:51
-msgid "Resent-from"
-msgstr "Resent-from"
+msgid "Resent-From"
+msgstr "Reenviado-De"
-#: templates/rule/footer.inc:72
+#: config/fields.php.dist:55
+msgid "Resent-To"
+msgstr "Reenviado-Para"
+
+#: templates/rule/footer.inc:61
msgid "Return to Filters List"
msgstr "Retornar para a Lista de Filtros"
-#: templates/whitelist/whitelist.inc:28 templates/blacklist/blacklist.inc:43
-#: templates/vacation/vacation.inc:75 templates/forward/forward.inc:38
+#: vacation.php:34 vacation.php:117 forward.php:34 forward.php:88 spam.php:62
+#: spam.php:141 templates/blacklist/blacklist.inc:42
+#: templates/whitelist/whitelist.inc:24
msgid "Return to Rules List"
msgstr "Retornar para a Lista de Regras"
-#: templates/filters/header.inc:21
+#: templates/filters/header.inc:24
msgid "Rule"
msgstr "Regra"
-#: filters.php:45
+#: filters.php:78
msgid "Rule Copied"
msgstr "Regra Copiada"
-#: filters.php:39
+#: filters.php:57
msgid "Rule Deleted"
msgstr "Regra Excluída"
-#: filters.php:59
+#: vacation.php:97 filters.php:94 forward.php:72 spam.php:122
msgid "Rule Disabled"
msgstr "Regra Desativada"
-#: filters.php:64
+#: vacation.php:88 filters.php:99 forward.php:63 spam.php:113
msgid "Rule Enabled"
msgstr "Regra Ativada"
-#: templates/rule/header.inc:39
-msgid "Rule Name"
-msgstr "Nome da Regra"
+#: templates/rule/header.inc:33
+msgid "Rule Name:"
+msgstr "Nome da Regra:"
-#: templates/whitelist/whitelist.inc:27 templates/blacklist/blacklist.inc:42
-#: templates/vacation/vacation.inc:74 templates/forward/forward.inc:37
-#: templates/rule/footer.inc:71
+#: lib/Script/sieve.php:2929
+msgid "Rule:"
+msgstr "Regra:"
+
+#: lib/Driver/ldap.php:86
+#, php-format
+msgid "STARTTLS failed: (%s) %s"
+msgstr "O STARTTLS falhou: (%s) %s"
+
+#: lib/Ingo.php:393
+msgid "S_pam"
+msgstr "S_pam"
+
+#: vacation.php:62 forward.php:45 spam.php:79
+#: templates/blacklist/blacklist.inc:41 templates/rule/footer.inc:60
+#: templates/whitelist/whitelist.inc:23
msgid "Save"
-msgstr "Salvar"
+msgstr "Gravar"
-#: templates/filters/settings.inc:47
+#: templates/filters/settings.inc:31
msgid "Save Settings"
-msgstr "Salvar Configurações"
+msgstr "Gravar Configurações"
+
+#: vacation.php:91 vacation.php:113 forward.php:66 forward.php:84 spam.php:116
+#: spam.php:137
+msgid "Save and Disable"
+msgstr "Gravar e Desabilitar"
-#: templates/script/header.inc:3
+#: vacation.php:82 vacation.php:115 forward.php:57 forward.php:86 spam.php:107
+#: spam.php:139
+msgid "Save and Enable"
+msgstr "Gravar e Habilitar"
+
+#: templates/script/header.inc:2
msgid "Script"
msgstr "Rotina"
@@ -582,31 +750,35 @@ msgstr "Rotina"
msgid "Script Updating"
msgstr "Atualizando Rotina"
-#: lib/Ingo.php:229
+#: lib/Ingo.php:175
msgid "Script not updated."
msgstr "Rotina não Atualizada."
-#: lib/Ingo.php:136
+#: lib/Ingo.php:146
msgid "Script successfully activated."
msgstr "Rotina ativada com sucesso."
-#: lib/Ingo.php:135
+#: lib/Ingo.php:145
msgid "Script successfully deactivated."
msgstr "Rotina desativada com sucesso."
-#: templates/rule/footer.inc:38
+#: templates/rule/footer.inc:30
msgid "Seen"
msgstr "Lida"
-#: rule.php:163
+#: rule.php:218
msgid "Select a field"
msgstr "Selecione um campo"
-#: lib/Ingo.php:50
+#: templates/menu.inc:6 templates/menu.inc:8
+msgid "Select ruleset to display:"
+msgstr "Selecionar conjunto de regras para exibir:"
+
+#: rule.php:347 lib/Ingo.php:59 templates/blacklist/blacklist.inc:23
msgid "Select target folder"
msgstr "Selecione a pasta destino"
-#: rule.php:184
+#: rule.php:255
msgid "Self-Defined Header"
msgstr "Cabeçalho Personalizado"
@@ -614,7 +786,7 @@ msgstr "Cabe
msgid "Sender"
msgstr "Remetente"
-#: filters.php:78
+#: filters.php:118
msgid "Settings successfully updated."
msgstr "Configurações atualizadas com sucesso."
@@ -626,41 +798,70 @@ msgstr "Exibir Rotina Ativa"
msgid "Show Current Script"
msgstr "Exibir Rotina Atual"
-#: config/fields.php.dist:83
+#: spam.php:18
+msgid "Simple spam filtering is not supported in the current filtering driver."
+msgstr "Filtro simples de spam não é suportado no driver atual de filtragem."
+
+#: config/fields.php.dist:95
msgid "Size"
msgstr "Tamanho"
-#: templates/rule/footer.inc:61
+#: config/fields.php.dist:87
+msgid "Source (From,Reply-to,etc)"
+msgstr "Origem (De,Responder a,etc)"
+
+#: filters.php:198 lib/Script/sieve.php:425 lib/Script/maildrop.php:301
+#: lib/Block/overview.php:105 lib/Block/overview.php:108
+msgid "Spam Filter"
+msgstr "Filtro de Spam"
+
+#: spam.php:158 spam.php:165
+msgid "Spam Filtering"
+msgstr "Filtragem de Spam"
+
+#: spam.php:71
+msgid "Spam Level:"
+msgstr "Nível de Spam:"
+
+#: vacation.php:43
+msgid "Start of vacation:"
+msgstr "Início das férias:"
+
+#: templates/rule/footer.inc:50
msgid "Stop checking if this rule matches?"
msgstr "Parar a checagem se esta regra corresponder?"
-#: templates/vacation/vacation.inc:55
-msgid "Subje_ct of vacation message:"
-msgstr "A_ssunto da mensagem de férias:"
-
#: config/fields.php.dist:31
msgid "Subject"
msgstr "Assunto"
-#: lib/api.php:68
+#: vacation.php:46
+msgid "Subject of vacation message:"
+msgstr "Assunto da mensagem de férias:"
+
+#: lib/Script/sieve.php:2928
+msgid "Subject:"
+msgstr "Assunto:"
+
+#: lib/api.php:103
#, php-format
msgid "The address \"%s\" has been added to your blacklist."
msgstr "O edereço \"%s\" foi adicionado a sua lista negra."
-#: lib/api.php:87
+#: lib/api.php:126
#, php-format
msgid "The address \"%s\" has been added to your whitelist."
msgstr "O edereço \"%s\" foi adicionado a sua lista branca."
-#: lib/Ingo.php:131
+#: lib/Ingo.php:141
msgid "The driver said: "
msgstr "O driver disse: "
-#: lib/Ingo.php:130
+#: lib/Ingo.php:140
msgid "There was an error activating the script."
msgstr "Houve um erro ao ativar a rotina."
-#: lib/Ingo.php:129
+#: lib/Ingo.php:139
msgid "There was an error deactivating the script."
msgstr "Houve um erro ao desativar a rotina."
@@ -668,45 +869,56 @@ msgstr "Houve um erro ao desativar a rotina."
msgid "To"
msgstr "Para"
-#: lib/Script.php:116
+#: templates/filters/filter.html:32
+msgid "To:"
+msgstr "Para:"
+
+#: lib/Script.php:126
#, php-format
msgid "Unable to load the definition of %s."
msgstr "Impossível carregar a definição de %s."
-#: filters.php:138 templates/vacation/vacation.inc:7
-#: lib/Script/procmail.php:272
+#: templates/rule/filter.inc:15
+msgid "User header"
+msgstr "Cabeçalho de usuário"
+
+#: vacation.php:151 filters.php:186 lib/Script/sieve.php:399
+#: lib/Script/maildrop.php:276 lib/Script/procmail.php:278
+#: lib/Block/overview.php:61 lib/Block/overview.php:64
msgid "Vacation"
msgstr "Férias"
-#: vacation.php:66
+#: vacation.php:158
msgid "Vacation Edit"
msgstr "Editar Opções de Férias"
-#: lib/Script/sieve.php:353
-msgid "Vacation Message"
-msgstr "Mensagem de Férias"
-
-#: vacation.php:16
+#: vacation.php:18
msgid "Vacation is not supported in the current filtering driver."
msgstr "Opções de férias não são suportadas no driver de filtro atual."
-#: templates/whitelist/whitelist.inc:18
+#: rule.php:353
+msgid "Value"
+msgstr "Valor"
+
+#: templates/whitelist/whitelist.inc:16
msgid "Wh_itelist addresses:"
msgstr "Endereços na _Lista Branca:"
-#: filters.php:132 templates/whitelist/whitelist.inc:7
+#: filters.php:180 lib/Block/overview.php:85 lib/Block/overview.php:88
+#: templates/whitelist/whitelist.inc:8
msgid "Whitelist"
msgstr "Lista Branca"
-#: whitelist.php:55
+#: whitelist.php:57
msgid "Whitelist Edit"
msgstr "Editar Lista Branca"
-#: whitelist.php:18
+#: whitelist.php:20
msgid "Whitelist is not supported in the current filtering driver."
msgstr "Lista Branca não é supportada pelo driver de filtro atual."
-#: lib/Script/procmail.php:240 lib/Script/sieve.php:299
+#: lib/Script/sieve.php:329 lib/Script/maildrop.php:224
+#: lib/Script/procmail.php:246
msgid "Whitelisted Addresses"
msgstr "Endereços na Lista Branca"
@@ -726,86 +938,98 @@ msgstr "X-Spam-Score"
msgid "X-Spam-Status"
msgstr "X-Spam-Status"
-#: vacation.php:30
-msgid ""
-"You must specify at least one email address for which the vacation messages "
-"should be activated."
+#: filters.php:71 rule.php:172
+#, php-format
+msgid "You are not allowed to create more than %d rules."
+msgstr "Você não pode cirar mais do que %d regras."
+
+#: filters.php:63 rule.php:23
+msgid "You are not allowed to create or edit custom rules."
+msgstr "Você não pode criar ou editar regras configuráveis."
+
+#: rule.php:96
+#, php-format
+msgid "You cannot create empty conditions. Please fill in a value for \"%s\"."
msgstr ""
-"Você deve especificar pelo menos um endereço de e-mail para que a mensagem "
-"de férias seja ativada."
+"Você não pode criar condições vazias. Por favor preencha um valor para \"%s"
+"\"."
-#: lib/Script/imap.php:281 lib/Script/imap.php:304 lib/Script/imap.php:318
-msgid "[No Subject]"
-msgstr "[Sem Assunto]"
+#: filters.php:52 rule.php:151
+msgid "You do not have permission to delete filter rules."
+msgstr "Você não tem permissão de excluir regras de filtro."
-#: templates/forward/forward.inc:27
-msgid "_Address(es) to forward to:"
-msgstr "_Endereço(s) para redirecionar:"
+#: filters.php:45 filters.php:112 filters.php:123 rule.php:58 rule.php:165
+msgid "You do not have permission to edit filter rules."
+msgstr "Você não tem permissão de editar regras de filtro."
-#: templates/vacation/vacation.inc:28
-msgid "_Addresses to not send responses to:"
-msgstr "_Endereço(s) para não enviar respostas:"
+#: lib/Script/sieve.php:2926
+msgid "You have received a new message"
+msgstr "Você tem uma nova mensagem"
-#: lib/Ingo.php:274
+#: lib/Script/imap.php:307 lib/Script/imap.php:330 lib/Script/imap.php:345
+msgid "[No Subject]"
+msgstr "[Sem Assunto]"
+
+#: lib/Ingo.php:384
msgid "_Blacklist"
msgstr "Lista _Negra"
-#: templates/blacklist/blacklist.inc:20
+#: templates/blacklist/blacklist.inc:18
msgid "_Delete message completely"
msgstr "E_xcluir mensagem completamente"
-#: templates/blacklist/blacklist.inc:33
+#: templates/blacklist/blacklist.inc:32
msgid "_Enter each address on a new line:"
msgstr "_Preencha cada endereço em uma nova linha:"
-#: lib/Ingo.php:280
+#: lib/Ingo.php:390
msgid "_Forward"
msgstr "_Encaminhar"
-#: templates/forward/forward.inc:19
-msgid "_Keep a copy of messages in this account?"
-msgstr "_Manter uma cópia das mensagens nesta conta?"
-
-#: templates/blacklist/blacklist.inc:24
+#: templates/blacklist/blacklist.inc:22
msgid "_Move message to folder:"
msgstr "_Mover mensagem para a pasta:"
-#: templates/vacation/vacation.inc:18
-msgid "_My email addresses:"
-msgstr "_Meus endereços de e-mail:"
+#: lib/Ingo.php:399
+msgid "_Permissions"
+msgstr "_Permissões"
-#: lib/Ingo.php:283
+#: lib/Ingo.php:396
msgid "_Script"
msgstr "_Rotina"
-#: lib/Ingo.php:277
+#: lib/Ingo.php:387
msgid "_Vacation"
msgstr "_Férias"
-#: lib/Ingo.php:271
+#: lib/Ingo.php:381
msgid "_Whitelist"
msgstr "Lista _Branca"
+#: lib/Block/overview.php:54
+msgid "active"
+msgstr "ativo"
+
#: templates/rule/filter.inc:4
msgid "and"
msgstr "e"
-#: filters.php:162
-msgid "field"
-msgstr "campo"
+#: templates/filters/filter.html:19
+msgid "disabled - click to enable"
+msgstr "desabilitado - clique para habilitar"
-#: filters.php:162
-msgid "match"
-msgstr "corresponde"
+#: lib/Block/overview.php:52
+msgid "inactive"
+msgstr "inativo"
+
+#: lib/Script/maildrop.php:134
+msgid "maildrop script generated by Ingo"
+msgstr "script de descarte de mensagem gerado pelo Ingo"
#: templates/rule/filter.inc:4
msgid "or"
msgstr "ou"
-#: lib/Script/procmail.php:126
+#: lib/Script/procmail.php:140
msgid "procmail script generated by Ingo"
msgstr "rotina do procmail gerada pelo Ingo"
-
-#: lib/Script/sieve.php:111
-msgid "sieve filter generated by Ingo"
-msgstr "filtro sieve gerado pelo Ingo"
diff --git a/rule.php b/rule.php
index a78937a..cf447d6 100644
--- a/rule.php
+++ b/rule.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Horde: ingo/rule.php,v 1.63.8.10 2008/01/02 11:32:08 jan Exp $
+ * $Horde: ingo/rule.php,v 1.63.8.12 2008/06/13 08:28:14 jan Exp $
*
* Copyright 2002-2008 The Horde Project (http://www.horde.org/)
*
@@ -216,7 +216,7 @@ foreach ($rule['conditions'] as $cond_num => $condition) {
if ($lastfield) {
$field_select .= '<option value="">' . _("Select a field") . "</option>\n" .
- "<option value=\"\"> --------- </option>\n";
+ "<option disabled=\"disabled\" value=\"\">- - - - - - - - -</option>\n";
}
foreach ($ingo_fields as $key => $val) {
@@ -235,7 +235,7 @@ foreach ($rule['conditions'] as $cond_num => $condition) {
/* Add any special types. */
$special = $ingo_script->specialTypes();
if (count($special)) {
- $field_select .= "<option value=\"\"> --------- </option>\n";
+ $field_select .= "<option disabled=\"disabled\" value=\"\">- - - - - - - - -</option>\n";
foreach ($special as $type) {
$selected = '';
if (isset($condition['field'])) {
@@ -251,7 +251,7 @@ foreach ($rule['conditions'] as $cond_num => $condition) {
/* Add user defined header option. */
$header_entry = false;
if ($conf['rules']['userheader']) {
- $field_select .= "<option value=\"\"> --------- </option>\n" .
+ $field_select .= "<option disabled=\"disabled\" value=\"\">- - - - - - - - -</option>\n" .
'<option value="' . INGO_USER_HEADER . '"' . ((!$option_selected) ? ' selected="selected"' : '') . '>' . _("Self-Defined Header") . (($lastfield) ? '' : ':') . "</option>\n";
if (!$option_selected) {
$header_entry = true;
@@ -285,7 +285,7 @@ foreach ($rule['conditions'] as $cond_num => $condition) {
}
if (empty($avail_tests)) {
- $match_select = "<option value=\"\"> --------- </option>\n";
+ $match_select = "<option disabled=\"disabled\" value=\"\">- - - - - - - - -</option>\n";
} else {
$first_test = null;
foreach ($avail_tests as $test) {
diff --git a/scripts/sql/ingo.sql b/scripts/sql/ingo.sql
index 1f2eb17..83e73a0 100644
--- a/scripts/sql/ingo.sql
+++ b/scripts/sql/ingo.sql
@@ -1,4 +1,4 @@
--- $Horde: ingo/scripts/sql/ingo.sql,v 1.6.2.4 2008/04/29 19:33:21 chuck Exp $
+-- $Horde: ingo/scripts/sql/ingo.sql,v 1.6.2.5 2008/06/18 00:42:08 mrubinsk Exp $
CREATE TABLE ingo_rules (
rule_id INT NOT NULL,
@@ -92,7 +92,7 @@ CREATE INDEX ingo_shares_groups_perm_idx ON ingo_shares_groups (perm);
CREATE TABLE ingo_shares_users (
share_id INT NOT NULL,
- user_uid VARCHAR(32) NOT NULL,
+ user_uid VARCHAR(255) NOT NULL,
perm SMALLINT NOT NULL
);
diff --git a/scripts/sql/ingo.xml b/scripts/sql/ingo.xml
new file mode 100644
index 0000000..8d829d6
--- /dev/null
+++ b/scripts/sql/ingo.xml
@@ -0,0 +1,556 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+
+ <name><variable>name</variable></name>
+ <create>false</create>
+ <overwrite>false</overwrite>
+
+ <table>
+
+ <name>ingo_forwards</name>
+
+ <declaration>
+
+ <field>
+ <name>forward_owner</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>forward_addresses</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <field>
+ <name>forward_keep</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>1</length>
+ </field>
+
+ <index>
+ <name>ingo_forwards_primary</name>
+ <primary>true</primary>
+ <field>
+ <name>forward_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_lists</name>
+
+ <declaration>
+
+ <field>
+ <name>list_owner</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>list_blacklist</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>list_address</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <index>
+ <name>ingo_lists_idx</name>
+ <field>
+ <name>list_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>list_blacklist</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_rules</name>
+
+ <declaration>
+
+ <field>
+ <name>rule_id</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_owner</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>rule_name</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>rule_action</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_value</name>
+ <type>text</type>
+ <default></default>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>rule_flags</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_conditions</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <field>
+ <name>rule_combine</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_stop</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_active</name>
+ <type>integer</type>
+ <default>1</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>rule_order</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <index>
+ <name>ingo_rules_primary</name>
+ <primary>true</primary>
+ <field>
+ <name>rule_id</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_rules_rule_owner</name>
+ <field>
+ <name>rule_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_shares</name>
+
+ <declaration>
+
+ <field>
+ <name>share_id</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>share_name</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>share_owner</name>
+ <type>text</type>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>share_flags</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <field>
+ <name>perm_creator</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <field>
+ <name>perm_default</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <field>
+ <name>perm_guest</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <field>
+ <name>attribute_name</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>attribute_desc</name>
+ <type>text</type>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <index>
+ <name>ingo_shares_primary</name>
+ <primary>true</primary>
+ <field>
+ <name>share_id</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_share_name</name>
+ <field>
+ <name>share_name</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_share_owner</name>
+ <field>
+ <name>share_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_perm_creator</name>
+ <field>
+ <name>perm_creator</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_perm_default</name>
+ <field>
+ <name>perm_default</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_perm_guest</name>
+ <field>
+ <name>perm_guest</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_shares_groups</name>
+
+ <declaration>
+
+ <field>
+ <name>share_id</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>group_uid</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>perm</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <index>
+ <name>ingo_shares_groups_share_id</name>
+ <field>
+ <name>share_id</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_groups_group_uid</name>
+ <field>
+ <name>group_uid</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_groups_perm</name>
+ <field>
+ <name>perm</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_shares_users</name>
+
+ <declaration>
+
+ <field>
+ <name>share_id</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>user_uid</name>
+ <type>text</type>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>perm</name>
+ <type>integer</type>
+ <notnull>true</notnull>
+ <length>2</length>
+ </field>
+
+ <index>
+ <name>ingo_shares_users_share_id</name>
+ <field>
+ <name>share_id</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_users_user_uid</name>
+ <field>
+ <name>user_uid</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ <index>
+ <name>ingo_shares_users_perm</name>
+ <field>
+ <name>perm</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_spam</name>
+
+ <declaration>
+
+ <field>
+ <name>spam_owner</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>spam_level</name>
+ <type>integer</type>
+ <default>5</default>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>spam_folder</name>
+ <type>text</type>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <index>
+ <name>ingo_spam_primary</name>
+ <primary>true</primary>
+ <field>
+ <name>spam_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+ <table>
+
+ <name>ingo_vacations</name>
+
+ <declaration>
+
+ <field>
+ <name>vacation_owner</name>
+ <type>text</type>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>vacation_addresses</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <field>
+ <name>vacation_subject</name>
+ <type>text</type>
+ <notnull>false</notnull>
+ <length>255</length>
+ </field>
+
+ <field>
+ <name>vacation_reason</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <field>
+ <name>vacation_days</name>
+ <type>integer</type>
+ <default>7</default>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>vacation_excludes</name>
+ <type>clob</type>
+ <notnull>false</notnull>
+ </field>
+
+ <field>
+ <name>vacation_ignorelists</name>
+ <type>integer</type>
+ <default>1</default>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>vacation_start</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <field>
+ <name>vacation_end</name>
+ <type>integer</type>
+ <notnull>false</notnull>
+ <length>4</length>
+ </field>
+
+ <index>
+ <name>ingo_vacations_primary</name>
+ <primary>true</primary>
+ <field>
+ <name>vacation_owner</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+
+ </declaration>
+
+ </table>
+
+</database>
diff --git a/scripts/upgrades/1.2_to_1.2.1.sql b/scripts/upgrades/1.2_to_1.2.1.sql
new file mode 100644
index 0000000..d5f6ac2
--- /dev/null
+++ b/scripts/upgrades/1.2_to_1.2.1.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ingo_shares CHANGE share_owner share_owner VARCHAR(255);
+ALTER TABLE ingo_shares_users CHANGE user_uid user_uid VARCHAR(255);
diff --git a/scripts/upgrades/convert_datatree_shares_to_sql.php b/scripts/upgrades/convert_datatree_shares_to_sql.php
index a505884..ea43947 100755
--- a/scripts/upgrades/convert_datatree_shares_to_sql.php
+++ b/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -5,7 +5,7 @@
* driver to the new SQL Horde_Share driver. You should run the 1.1_to_1.2.sql
* upgrade script before executing this script.
*
- * $Horde: ingo/scripts/upgrades/convert_datatree_shares_to_sql.php,v 1.1.2.3 2008/05/23 02:28:39 chuck Exp $
+ * $Horde: ingo/scripts/upgrades/convert_datatree_shares_to_sql.php,v 1.1.2.4 2008/06/06 15:08:02 mrubinsk Exp $
*/
@define('AUTH_HANDLER', true);
@@ -28,6 +28,7 @@ $config = $GLOBALS['conf']['sql'];
unset($config['charset']);
$db = MDB2::factory($config);
+$error_cnt = 0;
$delete_dt_data = false;
$answer = $cli->prompt('Do you want to keep your old datatree data or delete it?', array('Keep', 'Delete'));
if ($answer == 1) {
@@ -111,12 +112,14 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
$cli->message('Migrating share data for share_id: ' . $share_id, 'cli.message');
$result = insertData('ingo_shares', $data);
if (is_a($result, 'PEAR_Error')) {
+ ++$error_cnt;
$cli->message($result->getMessage(), 'cli.error');
}
if (count($groups)) {
foreach ($groups as $group) {
$result = insertData('ingo_shares_groups', $group);
if (is_a($result, 'PEAR_Error')) {
+ ++$error_cnt;
$cli->message($result->getMessage(), 'cli.error');
}
}
@@ -125,13 +128,14 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
foreach ($users as $user) {
$result = insertData('ingo_shares_users', $user);
if (is_a($result, 'PEAR_Error')) {
+ ++$error_cnt;
$cli->message($result->getMessage(), 'cli.error');
}
}
}
/* Delete the datatree data, but ONLY if it was requested */
- if ($delete_dt_data) {
+ if ($delete_dt_data && !$error_cnt) {
$cli->message('DELETING datatree data for share_id: ' . $share_id, 'cli.message');
$delete = $db->prepare('DELETE FROM horde_datatree_attributes WHERE datatree_id = ?', null, MDB2_PREPARE_MANIP);
$delete->execute(array($share_id));
@@ -146,6 +150,10 @@ while ($row = $shares_result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
$query_result->free();
unset($row, $rows, $data, $groups, $users);
}
+if ($error_cnt) {
+ $cli->message(sprintf("Encountered %u errors. No data was deleted from your database.", $error_cnt));
+}
+echo "\nDone.\n";
/**
* Helper function
diff --git a/templates/whitelist/whitelist.inc b/templates/whitelist/whitelist.inc
index e361245..1b14e40 100644
--- a/templates/whitelist/whitelist.inc
+++ b/templates/whitelist/whitelist.inc
@@ -1,24 +1,24 @@
<form method="post" name="filters" action="<?php echo Horde::applicationUrl('whitelist.php') ?>">
<?php Util::pformInput() ?>
<input type="hidden" name="actionID" value="rule_update" />
-<div class="header">
- <ul>
- <li><?php echo Help::link('ingo', 'whitelist') ?></li>
- </ul>
+<h1 class="header">
<?php echo _("Whitelist") ?>
+ <?php echo Help::link('ingo', 'whitelist') ?>
<?php if (!empty($wl_rule['disable'])): ?>
- [<font color="red"><?php echo _("Disabled") ?></font>]
+ [<span style="color:red"><?php echo _("Disabled") ?></span>]
<?php endif; ?>
-</div>
+</h1>
<table cellspacing="0" cellpadding="0">
<tr class="item0">
<td align="left">
<?php echo Horde::label('whitelist', _("Wh_itelist addresses:")) ?><br />
<textarea name="whitelist" id="whitelist" rows="15" cols="80"><?php echo htmlspecialchars(implode("\n", $whitelist->getWhitelist())) ?></textarea>
- </td><td align="right">
+ </td>
+ <td align="right">
<?php echo Help::link('ingo', 'whitelist-addresses') ?>
</td>
- </tr><tr>
+ </tr>
+ <tr>
<td colspan="2" class="control">
<input class="button" type="submit" value=" <?php echo _("Save") ?> " />
<input class="button" type="button" onclick="document.location.href='<?php echo Horde::applicationUrl('filters.php', true) ?>'" value="<?php echo _("Return to Rules List") ?>" />
--
Debian Horde Packages repository: ingo1 package
More information about the pkg-horde-hackers
mailing list