postfixadmin-svn Mailing List for PostfixAdmin (Page 113)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
| 2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
| 2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
| 2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
| 2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
| 2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
| 2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
| 2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
| 2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
| 2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
| 2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
| 2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
| 2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
| 2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
(10) |
Aug
(6) |
Sep
(16) |
Oct
(6) |
Nov
(2) |
Dec
(7) |
|
From: <chr...@us...> - 2007-11-12 01:54:20
|
Revision: 215
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=215&view=rev
Author: christian_boltz
Date: 2007-11-11 17:54:21 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
menu.tpl.orig:
- removed superfluous, unused menu.tpl.orig file
Removed Paths:
-------------
trunk/templates/menu.tpl.orig
Deleted: trunk/templates/menu.tpl.orig
===================================================================
--- trunk/templates/menu.tpl.orig 2007-11-12 01:26:01 UTC (rev 214)
+++ trunk/templates/menu.tpl.orig 2007-11-12 01:54:21 UTC (rev 215)
@@ -1,24 +0,0 @@
-<div id="submenu">
-<a target="_top" href="<?php print $_SERVER['PHP_SELF']; ?>"><?php print date("Y/m/d - H:i"); ?></a>·
-<?php
-if (($CONF['show_footer_text'] == "YES") and ($CONF['footer_link']))
-{
- print "<a target=\"_top\" href=\"" . $CONF['footer_link'] . "\">" . $CONF['footer_text'] . "</a>·\n";
-}
-?>
-<a target="_blank" href="http://postfixadmin.com/?version=<?php print $version; ?>"><?php print $PALANG['check_update']; ?></a>·
-<a target="_blank" href="http://postfixadmin.com/">Postfix Admin <?php print $version; ?></a>
-</div>
-<div id="menu">
-<a target="_top" href="overview.php"><?php print $PALANG['pMenu_overview']; ?></a>·
-<?php $url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; ?>
-<a target="_top" href="<?php print $url; ?>"><?php print $PALANG['pMenu_create_alias']; ?></a>·
-<?php $url = "create-mailbox.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; ?>
-<a target="_top" href="<?php print $url; ?>"><?php print $PALANG['pMenu_create_mailbox']; ?></a>·
-<a target="_top" href="sendmail.php"><?php print $PALANG['pMenu_sendmail']; ?></a>·
-<a target="_top" href="password.php"><?php print $PALANG['pMenu_password']; ?></a>·
-<a target="_top" href="viewlog.php"><?php print $PALANG['pMenu_viewlog']; ?></a>·
-<a target="_top" href="logout.php"><?php print $PALANG['pMenu_logout']; ?></a>
-</div>
-<?php if (file_exists (realpath ("motd.txt"))) include ("motd.txt"); ?>
-<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-12 01:25:57
|
Revision: 214
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=214&view=rev
Author: christian_boltz
Date: 2007-11-11 17:26:01 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
functions.inc.php
- allow longer TLDs (.museum, .travel)
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-11-12 00:46:52 UTC (rev 213)
+++ trunk/functions.inc.php 2007-11-12 01:26:01 UTC (rev 214)
@@ -194,7 +194,7 @@
// TODO: make check_domain able to handle as example .local domains
function check_domain ($domain)
{
- if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,4}$/i', trim ($domain)))
+ if (preg_match ('/([-0-9A-Z]+\.)+' . '([0-9A-Z]){2,6}$/i', trim ($domain)))
{
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-12 00:46:53
|
Revision: 213
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=213&view=rev
Author: christian_boltz
Date: 2007-11-11 16:46:52 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
users/password.php
- merged GET and POST code
- make cancel button working
- redirect to main page on success
- displaying success note with flash_info()
templates/users_password.tpl:
- rename cancel button to fCancel to make it work
users/vacation.php
- redirect to main page on success
- displaying success note with flash_info()
- merge GET and POST code
Modified Paths:
--------------
trunk/templates/users_password.tpl
trunk/users/password.php
trunk/users/vacation.php
Modified: trunk/templates/users_password.tpl
===================================================================
--- trunk/templates/users_password.tpl 2007-11-12 00:14:16 UTC (rev 212)
+++ trunk/templates/users_password.tpl 2007-11-12 00:46:52 UTC (rev 213)
@@ -27,7 +27,7 @@
<tr>
<td colspan="3" class="hlp_center">
<input class="button" type="submit" name="submit" value="<?php print $PALANG['pPassword_button']; ?>" />
- <input class="button" type="submit" name="submit" value="<?php print $PALANG['exit']; ?>" action="main.php" >
+ <input class="button" type="submit" name="fCancel" value="<?php print $PALANG['exit']; ?>" />
</td>
</tr>
<tr>
Modified: trunk/users/password.php
===================================================================
--- trunk/users/password.php 2007-11-12 00:14:16 UTC (rev 212)
+++ trunk/users/password.php 2007-11-12 00:46:52 UTC (rev 213)
@@ -35,16 +35,13 @@
$tmp = preg_split ('/@/', $USERID_USERNAME);
$USERID_DOMAIN = $tmp[1];
-if ($_SERVER['REQUEST_METHOD'] == "GET")
+if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- include ("../templates/header.tpl");
- include ("../templates/users_menu.tpl");
- include ("../templates/users_password.tpl");
- include ("../templates/footer.tpl");
-}
+ if(isset($_POST['fCancel'])) {
+ header("Location: main.php");
+ exit(0);
+ }
-if ($_SERVER['REQUEST_METHOD'] == "POST")
-{
$fPassword_current = escape_string ($_POST['fPassword_current']);
$fPassword = escape_string ($_POST['fPassword']);
$fPassword2 = escape_string ($_POST['fPassword2']);
@@ -82,18 +79,22 @@
$result = db_query ("UPDATE $table_mailbox SET password='$password',modified=NOW() WHERE username='$username'");
if ($result['rows'] == 1)
{
- $tMessage = $PALANG['pPassword_result_success'];
+ flash_info($PALANG['pPassword_result_success']);
db_log ($USERID_USERNAME, $USERID_DOMAIN, 'edit_password', "$USERID_USERNAME");
+ header("Location: main.php");
+ exit(0);
}
else
{
$tMessage = $PALANG['pPassword_result_error'];
}
}
+}
- include ("../templates/header.tpl");
- include ("../templates/users_menu.tpl");
- include ("../templates/users_password.tpl");
- include ("../templates/footer.tpl");
-}
+include ("../templates/header.tpl");
+include ("../templates/users_menu.tpl");
+include ("../templates/users_password.tpl");
+include ("../templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2007-11-12 00:14:16 UTC (rev 212)
+++ trunk/users/vacation.php 2007-11-12 00:46:52 UTC (rev 213)
@@ -58,13 +58,6 @@
if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
-
- $template = "users_vacation.tpl";
-
- include ("../templates/header.tpl");
- include ("../templates/users_menu.tpl");
- include ("../templates/users_vacation.tpl");
- include ("../templates/footer.tpl");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -174,16 +167,25 @@
}
else
{
+ flash_info($PALANG['pVacation_result_added']);
header ("Location: main.php");
exit;
}
}
- include ("../templates/header.tpl");
- include ("../templates/users_menu.tpl");
- include ("../templates/users_vacation.tpl");
- include ("../templates/footer.tpl");
+ if (!empty ($fBack)) {
+ if ($tMessage == '' || $tMessage = $PALANG['pUsersVacation_result_success']) {
+ flash_info($PALANG['pVacation_result_removed']);
+ header ("Location: main.php");
+ exit;
+ }
+ }
}
+include ("../templates/header.tpl");
+include ("../templates/users_menu.tpl");
+include ("../templates/users_vacation.tpl");
+include ("../templates/footer.tpl");
+
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-12 00:14:11
|
Revision: 212
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=212&view=rev
Author: christian_boltz
Date: 2007-11-11 16:14:16 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
- Always display the $_POST data if available (tSubject and tBody were
not set, resulting in the default vacation texts displayed)
Modified Paths:
--------------
trunk/edit-vacation.php
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-11-11 23:36:46 UTC (rev 211)
+++ trunk/edit-vacation.php 2007-11-12 00:14:16 UTC (rev 212)
@@ -84,10 +84,12 @@
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_POST['fSubject'])) $fSubject = escape_string ($_POST['fSubject']);
- if (isset ($_POST['fBody'])) $fBody = escape_string ($_POST['fBody']);
- if (isset ($_POST['fChange'])) $fChange = escape_string ($_POST['fChange']);
- if (isset ($_POST['fBack'])) $fBack = escape_string ($_POST['fBack']);
+ $tSubject = safepost('fSubject');
+ $fSubject = escape_string ( $tSubject);
+ $tBody = safepost('fBody');
+ $fBody = escape_string ( $tBody);
+ $fChange = escape_string (safepost('fChange'));
+ $fBack = escape_string (safepost('fBack'));
if(authentication_has_role('admin') && isset($_GET['domain'])) {
$fDomain = escape_string ($_GET['domain']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-11 23:36:42
|
Revision: 211
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=211&view=rev
Author: christian_boltz
Date: 2007-11-11 15:36:46 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
enabled expansion of $Id$ and $Rev$ on all non-binary files
Modified Paths:
--------------
trunk/ADDITIONS/mailbox_remover.pl
Property Changed:
----------------
trunk/ADDITIONS/README.TXT
trunk/ADDITIONS/cleanupdirs.pl
trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
trunk/ADDITIONS/fetchmail.pl
trunk/ADDITIONS/mailbox_remover.pl
trunk/ADDITIONS/mkeveryone.pl
trunk/ADDITIONS/pfa_maildir_cleanup.pl
trunk/ADDITIONS/postfixadmin-domain-postdeletion.sh
trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh
trunk/ADDITIONS/postfixadmin-mailbox-postdeletion.sh
trunk/ADDITIONS/virtualmaildel.php
trunk/CHANGELOG.TXT
trunk/DATABASE_MYSQL.TXT
trunk/DATABASE_PGSQL.TXT
trunk/DOCUMENTS/BACKUP_MX.TXT
trunk/DOCUMENTS/DOVECOT.TXT
trunk/DOCUMENTS/LANGUAGE.TXT
trunk/DOCUMENTS/POSTFIXADMIN.TXT
trunk/DOCUMENTS/POSTFIX_CONF.TXT
trunk/DOCUMENTS/SUPERADMIN.TXT
trunk/DOCUMENTS/TABLE_BACKUP_MX.TXT
trunk/DOCUMENTS/TABLE_CHANGES.TXT
trunk/DOCUMENTS/UPGRADE.TXT
trunk/DOCUMENTS/screenshots/README.txt
trunk/GPL-LICENSE.TXT
trunk/INSTALL.TXT
trunk/LICENSE.TXT
trunk/VIRTUAL_VACATION/FILTER_README
trunk/VIRTUAL_VACATION/INSTALL.TXT
trunk/VIRTUAL_VACATION/index.php
trunk/VIRTUAL_VACATION/mail-filter
trunk/VIRTUAL_VACATION/vacation.pl
trunk/admin/index.php
trunk/backup.php
trunk/broadcast-message.php
trunk/common.php
trunk/create-admin.php
trunk/create-alias.php
trunk/create-domain.php
trunk/create-mailbox.php
trunk/delete.php
trunk/edit-active-admin.php
trunk/edit-active-domain.php
trunk/edit-active.php
trunk/edit-admin.php
trunk/edit-alias.php
trunk/edit-domain.php
trunk/edit-mailbox.php
trunk/edit-vacation.php
trunk/fetchmail.php
trunk/functions.inc.php
trunk/images/index.php
trunk/index.php
trunk/languages/index.php
trunk/languages/language-update.sh
trunk/list-admin.php
trunk/list-domain.php
trunk/list-virtual.php
trunk/login.php
trunk/logout.php
trunk/main.php
trunk/motd-users.txt
trunk/motd.txt
trunk/password.php
trunk/search.php
trunk/sendmail.php
trunk/setup.php
trunk/stylesheet.css
trunk/templates/admin_create-admin.tpl
trunk/templates/admin_create-domain.tpl
trunk/templates/admin_edit-admin.tpl
trunk/templates/admin_edit-domain.tpl
trunk/templates/admin_list-admin.tpl
trunk/templates/admin_list-domain.tpl
trunk/templates/admin_search.tpl
trunk/templates/broadcast-message.tpl
trunk/templates/create-alias.tpl
trunk/templates/create-mailbox.tpl
trunk/templates/edit-alias.tpl
trunk/templates/edit-mailbox.tpl
trunk/templates/edit-vacation.tpl
trunk/templates/fetchmail.tpl
trunk/templates/footer.tpl
trunk/templates/header.tpl
trunk/templates/index.php
trunk/templates/list-virtual.tpl
trunk/templates/login.tpl
trunk/templates/main.tpl
trunk/templates/menu.tpl
trunk/templates/menu.tpl.orig
trunk/templates/message.tpl
trunk/templates/overview-get.tpl
trunk/templates/password.tpl
trunk/templates/search.tpl
trunk/templates/sendmail.tpl
trunk/templates/users_edit-alias.tpl
trunk/templates/users_login.tpl
trunk/templates/users_main.tpl
trunk/templates/users_menu.tpl
trunk/templates/users_password.tpl
trunk/templates/viewlog.tpl
trunk/upgrade.php
trunk/users/edit-alias.php
trunk/users/index.php
trunk/users/login.php
trunk/users/logout.php
trunk/users/main.php
trunk/users/password.php
trunk/variables.inc.php
trunk/viewlog.php
Property changes on: trunk/ADDITIONS/README.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/cleanupdirs.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/convert-passwd-to-postfixadmin.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/fetchmail.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/ADDITIONS/mailbox_remover.pl
===================================================================
--- trunk/ADDITIONS/mailbox_remover.pl 2007-11-11 23:23:53 UTC (rev 210)
+++ trunk/ADDITIONS/mailbox_remover.pl 2007-11-11 23:36:46 UTC (rev 211)
@@ -6,7 +6,7 @@
#
# Added subdir support and pause --- Alan Batie 2007
# Lists directories to be deleted then pauses for 5 seconds for chance to abort
-# $Id: mbox_remover,v 1.4 2007/07/12 22:11:09 alan Exp alan $
+# $Id$
#
# All your maildirs or other directories could be accidentally removed.
# Use it at own risk. No warranties!
Property changes on: trunk/ADDITIONS/mailbox_remover.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/mkeveryone.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/pfa_maildir_cleanup.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/postfixadmin-domain-postdeletion.sh
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/postfixadmin-mailbox-postcreation.sh
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/postfixadmin-mailbox-postdeletion.sh
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/ADDITIONS/virtualmaildel.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/CHANGELOG.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DATABASE_MYSQL.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DATABASE_PGSQL.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/BACKUP_MX.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/DOVECOT.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/LANGUAGE.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/POSTFIXADMIN.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/POSTFIX_CONF.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/SUPERADMIN.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/TABLE_BACKUP_MX.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/TABLE_CHANGES.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/UPGRADE.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/DOCUMENTS/screenshots/README.txt
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/GPL-LICENSE.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/INSTALL.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/LICENSE.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/VIRTUAL_VACATION/FILTER_README
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/VIRTUAL_VACATION/INSTALL.TXT
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/VIRTUAL_VACATION/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/VIRTUAL_VACATION/mail-filter
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/VIRTUAL_VACATION/vacation.pl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/admin/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/backup.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/broadcast-message.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/common.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/create-admin.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/create-alias.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/create-domain.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/create-mailbox.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/delete.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-active-admin.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-active-domain.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-active.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-admin.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-alias.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-domain.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-mailbox.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/edit-vacation.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/fetchmail.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/functions.inc.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/images/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/languages/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/languages/language-update.sh
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/list-admin.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/list-domain.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/list-virtual.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/login.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/logout.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/main.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/motd-users.txt
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/motd.txt
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/password.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/search.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/sendmail.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/setup.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/stylesheet.css
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_create-admin.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_create-domain.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_edit-admin.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_edit-domain.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_list-admin.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_list-domain.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/admin_search.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/broadcast-message.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/create-alias.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/create-mailbox.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/edit-alias.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/edit-mailbox.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/edit-vacation.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/fetchmail.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/footer.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/header.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/list-virtual.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/login.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/main.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/menu.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/menu.tpl.orig
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/message.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/overview-get.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/password.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/search.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/sendmail.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/users_edit-alias.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/users_login.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/users_main.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/users_menu.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/users_password.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/templates/viewlog.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/upgrade.php
___________________________________________________________________
Name: svn:keywords
- Revision
+ Id Rev
Property changes on: trunk/users/edit-alias.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/users/index.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/users/login.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/users/logout.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/users/main.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/users/password.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/variables.inc.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Property changes on: trunk/viewlog.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-11 23:23:49
|
Revision: 210
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=210&view=rev
Author: christian_boltz
Date: 2007-11-11 15:23:53 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
- removed outdated TODO note
Modified Paths:
--------------
trunk/config.inc.php
Property Changed:
----------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2007-11-11 23:08:58 UTC (rev 209)
+++ trunk/config.inc.php 2007-11-11 23:23:53 UTC (rev 210)
@@ -158,7 +158,6 @@
// Vacation Control
// If you want users to take control of vacation set this to 'YES'.
-// TODO: not implemented
$CONF['vacation_control'] ='YES';
// Vacation Control for admins
Property changes on: trunk/config.inc.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-11 23:08:53
|
Revision: 209
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=209&view=rev
Author: christian_boltz
Date: 2007-11-11 15:08:58 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
(basically the same as in r200, this time for users/vacation.php)
users/vacation.php
- fix double-encoded special characters if language file contains
entity-encoded strings by html_entity_decode'ing the string
(will be encoded in template file later)
users_vacation.tpl:
- encode tSubject with htmlentities() in template
Modified Paths:
--------------
trunk/templates/users_vacation.tpl
trunk/users/vacation.php
Property Changed:
----------------
trunk/templates/users_vacation.tpl
trunk/users/vacation.php
Modified: trunk/templates/users_vacation.tpl
===================================================================
--- trunk/templates/users_vacation.tpl 2007-11-11 22:48:07 UTC (rev 208)
+++ trunk/templates/users_vacation.tpl 2007-11-11 23:08:58 UTC (rev 209)
@@ -6,7 +6,7 @@
</tr>
<tr>
<td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
- <td><input type="text" name="fSubject" value="<?php print $tSubject; ?>" /></td>
+ <td><input type="text" name="fSubject" value="<?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?>" /></td>
<td> </td>
</tr>
<tr>
@@ -31,3 +31,4 @@
</table>
</form>
</div>
+<?php /* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?>
Property changes on: trunk/templates/users_vacation.tpl
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/users/vacation.php
===================================================================
--- trunk/users/vacation.php 2007-11-11 22:48:07 UTC (rev 208)
+++ trunk/users/vacation.php 2007-11-11 23:08:58 UTC (rev 209)
@@ -42,7 +42,7 @@
exit(0);
}
-$tmp = preg_split ('/@/', $USERID_USERNAME);
+$tmp = preg_split ('/@/', $USERID_USERNAME);
$USERID_DOMAIN = $tmp[1];
if ($_SERVER['REQUEST_METHOD'] == "GET")
@@ -56,10 +56,10 @@
$tBody = $row['body'];
}
- if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
- if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+ if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+ if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
- $template = "users_vacation.tpl";
+ $template = "users_vacation.tpl";
include ("../templates/header.tpl");
include ("../templates/users_menu.tpl");
@@ -85,8 +85,8 @@
if (isset ($_POST['fBack'])) $fBack = escape_string ($_POST['fBack']);
//set a default, reset fields for coming back selection
- if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
- if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+ if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+ if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
// if they've set themselves away OR back, delete any record of vacation emails.
if (!empty ($fBack) || !empty ($fAway))
@@ -184,4 +184,6 @@
include ("../templates/users_vacation.tpl");
include ("../templates/footer.tpl");
}
+
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
Property changes on: trunk/users/vacation.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-11 22:48:05
|
Revision: 208
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=208&view=rev
Author: christian_boltz
Date: 2007-11-11 14:48:07 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
list-virtual.tpl
- made '[and x more...]' translatable
*.lang:
- added 'and_x_more'
- added $Id$ keyword
- enabled expansion of $Id$ and $Rev$
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
trunk/templates/list-virtual.tpl
Property Changed:
----------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/bg.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Bulgarian
// by Plamen Tonev
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Å-ìåéë';
$PALANG['pOverview_mailbox_name'] = 'Èìå';
$PALANG['pOverview_mailbox_quota'] = 'Îáåì (MB)';
Property changes on: trunk/languages/bg.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/ca.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Catalan
// by Jaume
@@ -58,6 +59,7 @@
$PALANG['pOverview_alias_modified'] = 'Última modificació';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Nom';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/ca.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/cn.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Simplified Chinese
// by Matthew <matthew at cnfug dot org>
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = '最后修改日期';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = '邮件地址';
$PALANG['pOverview_mailbox_name'] = '姓名';
$PALANG['pOverview_mailbox_quota'] = '限制 (MB)';
Property changes on: trunk/languages/cn.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/cs.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Czech
// by Jakub
@@ -62,6 +63,7 @@
$PALANG['pOverview_alias_modified'] = 'Naposledy změněno';
$PALANG['pOverview_alias_active'] = 'Aktivní';
$PALANG['pOverview_alias_edit'] = 'Přesměrování';
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Jméno';
$PALANG['pOverview_mailbox_quota'] = 'Místo (MB)';
Property changes on: trunk/languages/cs.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/da.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Danish
// by Lars
@@ -61,6 +62,7 @@
$PALANG['pOverview_alias_modified'] = 'Senest ændret';
$PALANG['pOverview_alias_active'] = 'Aktiveret';
$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
$PALANG['pOverview_mailbox_name'] = 'Navn';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
Property changes on: trunk/languages/da.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/de.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file German
// by Tobias
@@ -60,6 +61,7 @@
$PALANG['pOverview_alias_modified'] = 'Zuletzt verändert';
$PALANG['pOverview_alias_active'] = 'Aktiv';
$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[und %s weitere...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Name';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
@@ -247,7 +249,7 @@
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
$PALANG['pAdminCreate_domain_defaultaliases'] = 'Standard-Aliase hinzufügen';
-$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
$PALANG['pAdminCreate_domain_button'] = 'Domain hinzufügen';
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Konnte Domain nicht anlegen!</span>';
Property changes on: trunk/languages/de.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/en.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file English
// by Mischa <mischa at high5 dot net>
@@ -61,6 +62,7 @@
$PALANG['pOverview_alias_modified'] = 'Last Modified';
$PALANG['pOverview_alias_active'] = 'Active';
$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[and %s more...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Name';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/en.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/es.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Spanish
// by Alvaro
@@ -58,6 +59,7 @@
$PALANG['pOverview_alias_modified'] = 'Última modificación';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Nombre';
$PALANG['pOverview_mailbox_quota'] = 'Cuota (MB)';
Property changes on: trunk/languages/es.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/et.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Estonian
// by Peeter Partel <peeter at sigma dot ee>
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Viimati muudetud';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
$PALANG['pOverview_mailbox_name'] = 'Nimi';
$PALANG['pOverview_mailbox_quota'] = 'Kettaruumi piirang (MB)';
Property changes on: trunk/languages/et.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/eu.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Euskara
// by Julen
@@ -58,6 +59,7 @@
$PALANG['pOverview_alias_modified'] = 'Azken aldaketa';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Izena';
$PALANG['pOverview_mailbox_quota'] = 'Kuota (MB)';
Property changes on: trunk/languages/eu.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/fi.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Finnish
// by Palo
@@ -62,6 +63,7 @@
$PALANG['pOverview_alias_modified'] = 'Viimeksi muokattu';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Sähköposti';
$PALANG['pOverview_mailbox_name'] = 'Nimi';
$PALANG['pOverview_mailbox_quota'] = 'Kiintiö (MB)';
Property changes on: trunk/languages/fi.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/fo.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Faroese
// by Danial
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Síðst broytt';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-post';
$PALANG['pOverview_mailbox_name'] = 'Navn';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
Property changes on: trunk/languages/fo.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/fr.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file French
// by Kuthz
@@ -61,6 +62,7 @@
$PALANG['pOverview_alias_modified'] = 'Dernière Modification';
$PALANG['pOverview_alias_active'] = 'Activé';
$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'courriel';
$PALANG['pOverview_mailbox_name'] = 'Nom';
$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
Property changes on: trunk/languages/fr.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/hr.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Croatian
// by Daniel Radetic <drade at boobah dot info>
@@ -58,6 +59,7 @@
$PALANG['pOverview_alias_modified'] = 'Zadnja promjena';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-pota';
$PALANG['pOverview_mailbox_name'] = 'Ime';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
Property changes on: trunk/languages/hr.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/hu.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Hungarian
// by Christian Hamar <krics at linuxforum dot hu> and Levente Farkas <lfarkas at lfarkas dot org>
@@ -60,6 +61,7 @@
$PALANG['pOverview_alias_modified'] = 'Utolsó módosítás';
$PALANG['pOverview_alias_active'] = 'Aktív';
$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Név';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/hu.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/is.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Icelandic
// by Gestur
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Síðast breytt';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Póstfang';
$PALANG['pOverview_mailbox_name'] = 'Nafn notanda';
$PALANG['pOverview_mailbox_quota'] = 'Heimild kvóta (MB)';
Property changes on: trunk/languages/is.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/it.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Italian
// by Massimiliano Stucchi <max at gufi dot org>
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Ultima modifica';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Nome';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/it.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/lt.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Lithuanian
// by Giedrius <giedrius_balbieris at metalot dot com>
@@ -58,6 +59,7 @@
$PALANG['pOverview_alias_modified'] = 'Paskutinis keitimas';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'El.paštas';
$PALANG['pOverview_mailbox_name'] = 'Vardas';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
Property changes on: trunk/languages/lt.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/mk.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Macedonian
// by Damjan Georgiev <dame at mol dot com dot mk>
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Последна промена';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Адреса';
$PALANG['pOverview_mailbox_name'] = 'Име';
$PALANG['pOverview_mailbox_quota'] = 'Квота (MB)';
Property changes on: trunk/languages/mk.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/nl.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Dutch
// by Mourik
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Laatst Bewerkt';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
$PALANG['pOverview_mailbox_name'] = 'Naam';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/nl.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/nn.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Norwegian - Bokmål
// by Jon Arve Wålberg
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Sist endret';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-post';
$PALANG['pOverview_mailbox_name'] = 'Nann';
$PALANG['pOverview_mailbox_quota'] = 'Kvote (MB)';
Property changes on: trunk/languages/nn.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/pl.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Polish
// by Jarek
@@ -61,6 +62,7 @@
$PALANG['pOverview_alias_modified'] = 'Ostatnio zmodyfikowany';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Name';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/pl.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/pt-br.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Portuguese - Brazil
// by Roberto
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Última modificação';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Usuário';
$PALANG['pOverview_mailbox_name'] = 'Nome';
$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
Property changes on: trunk/languages/pt-br.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/ru.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Russian
// by Paul; updated by Pavel Usischev
@@ -61,6 +62,7 @@
$PALANG['pOverview_alias_modified'] = 'Последнее изменение';
$PALANG['pOverview_alias_active'] = 'Активен';
$PALANG['pOverview_alias_edit'] = 'Алиас';
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Ящик';
$PALANG['pOverview_mailbox_name'] = 'Имя';
$PALANG['pOverview_mailbox_quota'] = 'Квота (МБ)';
Property changes on: trunk/languages/ru.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/sk.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Slovak
// by bajk
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Naposledy zmenené';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Meno';
$PALANG['pOverview_mailbox_quota'] = 'Miesto (MB)';
Property changes on: trunk/languages/sk.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/sl.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Slovenian
// by Nejc Skoberne <nejc at skoberne dot net>
@@ -60,6 +61,7 @@
$PALANG['pOverview_alias_modified'] = 'Zadnjič spremenjeno';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-pošta';
$PALANG['pOverview_mailbox_name'] = 'Ime';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
Property changes on: trunk/languages/sl.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/sv.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Swedish
// by Stefan Jakobsson <stefan at katrinet dot se>
@@ -60,6 +61,7 @@
$PALANG['pOverview_alias_modified'] = 'Senast Ändrad';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Epost';
$PALANG['pOverview_mailbox_name'] = 'Namn';
$PALANG['pOverview_mailbox_quota'] = 'Quota (MB)';
Property changes on: trunk/languages/sv.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/tr.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Türkçe
// by Onuryalazi
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = 'Son Düzenleme';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Eposta';
$PALANG['pOverview_mailbox_name'] = 'Ýsim';
$PALANG['pOverview_mailbox_quota'] = 'kota (MB)';
Property changes on: trunk/languages/tr.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/languages/tw.lang 2007-11-11 22:48:07 UTC (rev 208)
@@ -1,4 +1,5 @@
<?php
+# $Id$
//
// Language file Traditional Chinese
// by Bruce Chou <bruce at thumb dot cx>
@@ -59,6 +60,7 @@
$PALANG['pOverview_alias_modified'] = '³Ì«áקï¤é´Á';
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
+$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = '¶l¥ó¦ì§}';
$PALANG['pOverview_mailbox_name'] = '©m¦W';
$PALANG['pOverview_mailbox_quota'] = '«H½c¨î (MB)';
Property changes on: trunk/languages/tw.lang
___________________________________________________________________
Name: svn:keywords
+ Id Rev
Modified: trunk/templates/list-virtual.tpl
===================================================================
--- trunk/templates/list-virtual.tpl 2007-11-11 21:41:18 UTC (rev 207)
+++ trunk/templates/list-virtual.tpl 2007-11-11 22:48:07 UTC (rev 208)
@@ -97,7 +97,18 @@
print " <td>" . $tAlias[$i]['address'] . "</td>\n";
if ($CONF['alias_goto_limit'] > 0) {
- print " <td>" . ereg_replace (",", "<br>", preg_replace('/^(([^,]+,){'.$CONF['alias_goto_limit'].'})[^,]+,.*/','$1[and '. (substr_count ($tAlias[$i]['goto'], ',') - $CONF['alias_goto_limit'] + 1) .' more...]',$tAlias[$i]['goto'])) . "</td>\n";
+ print " <td>" . ereg_replace (
+ ",",
+ "<br>",
+ preg_replace(
+ '/^(([^,]+,){'.$CONF['alias_goto_limit'].'})[^,]+,.*/',
+ '$1' . sprintf(
+ $PALANG['and_x_more'],
+ (substr_count ($tAlias[$i]['goto'], ',') - $CONF['alias_goto_limit'] + 1)
+ ),
+ $tAlias[$i]['goto']
+ )
+ ) . "</td>\n";
} else {
print " <td>" . ereg_replace (",", "<br>", $tAlias[$i]['goto']) . "</td>\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-11 21:41:16
|
Revision: 207
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=207&view=rev
Author: GingerDog
Date: 2007-11-11 13:41:18 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
vacation.pl: updating spam check bit
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2007-11-11 19:05:42 UTC (rev 206)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2007-11-11 21:41:18 UTC (rev 207)
@@ -325,7 +325,7 @@
elsif (/^cc:\s+(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }
elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }
elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }
- elsif (/^x-spam-flag:\s+yes$/i) { exit (0); }
+ elsif (/^x-spam-(flag|status):\s+yes/i) { exit (0); }
elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }
elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }
else {$lastheader = "" ; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-11 19:05:42
|
Revision: 206
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=206&view=rev
Author: christian_boltz
Date: 2007-11-11 11:05:42 -0800 (Sun, 11 Nov 2007)
Log Message:
-----------
- do not clear password on editing admins when no new password is entered
Thanks for Benny Pedersen (xpunkt) to find out that this bug reappeared.
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1829564&group_id=191583
Modified Paths:
--------------
trunk/edit-admin.php
Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php 2007-11-10 00:39:08 UTC (rev 205)
+++ trunk/edit-admin.php 2007-11-11 19:05:42 UTC (rev 206)
@@ -101,7 +101,11 @@
$sqlActive = db_get_boolean(False);
}
- $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive',password='$fPassword' WHERE username='$username'");
+ $password_query = '';
+ if ($fPassword != '') { # do not change password to empty one
+ $password_query = ", password='$fPassword'";
+ }
+ $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' $password_query WHERE username='$username'");
if ($fSadmin == "on") $fSadmin = 'ALL';
@@ -150,3 +154,6 @@
include ("templates/menu.tpl");
include ("templates/admin_edit-admin.tpl");
include ("templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-10 00:39:07
|
Revision: 205
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=205&view=rev
Author: christian_boltz
Date: 2007-11-09 16:39:08 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
updated translations:
- ru.lang updated by Pavel Usischev (pusischev)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828828&group_id=191583
- da.lang updated by Jesper R. Meyer (jespermeyer)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1828916&group_id=191583
Thanks!
Modified Paths:
--------------
trunk/languages/da.lang
trunk/languages/ru.lang
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-11-08 21:21:16 UTC (rev 204)
+++ trunk/languages/da.lang 2007-11-10 00:39:08 UTC (rev 205)
@@ -2,186 +2,192 @@
//
// Language file Danish
// by Lars
+// updated by Jesper R. Meyer <jrm at upthere dot dk>
//
$PALANG['YES'] = 'JA';
$PALANG['NO'] = 'NEJ';
-$PALANG['edit'] = 'rediger';
+$PALANG['edit'] = 'redigere';
$PALANG['del'] = 'slet';
-$PALANG['exit'] = 'Exit'; # XXX
-$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
-$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster for dette domæne? Dette kan ikke fortrydes!\n';
-$PALANG['check_update'] = 'Check for update';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
+$PALANG['exit'] = 'Log af';
+$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
+$PALANG['confirm_domain'] = 'Vil du virkelig slette alle adresser for dette domæne? Dette kan ikke fortrydes!\n';
+$PALANG['check_update'] = 'Søg efter opdateringer';
+$PALANG['invalid_parameter'] = 'Ugyldig parameter!';
-$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind her for at administrere dine domæner.';
+$PALANG['pFooter_logged_as'] = 'Indlogget som %s';
+
+$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind for at administrere dine domæner.';
$PALANG['pLogin_username'] = 'Brugernavn (email)';
-$PALANG['pLogin_password'] = 'Kodeord';
+$PALANG['pLogin_password'] = 'Adgangskode';
$PALANG['pLogin_button'] = 'Login';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Verificer at du bruger din email-adresse som login!</span>';
-$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Dit kodeord er forkert!</span>';
-$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
+$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Dit brugernavn er forkert. Kontroller at du bruger din emailadresse som brugernavn!</span>';
+$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Din adgangskode er forkert!</span>';
+$PALANG['pLogin_login_users'] = 'Bruger: Log ind på brugersektionen her.';
-$PALANG['pMenu_main'] = 'Main'; # XXX
+$PALANG['pMenu_main'] = 'Start';
$PALANG['pMenu_overview'] = 'Oversigt';
-$PALANG['pMenu_create_alias'] = 'Tilføj alias';
-$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
-$PALANG['pMenu_sendmail'] = 'Send Email';
-$PALANG['pMenu_password'] = 'Kodeord';
-$PALANG['pMenu_viewlog'] = 'Vis Log';
+$PALANG['pMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
+$PALANG['pMenu_fetchmail'] = 'Hent email';
+$PALANG['pMenu_sendmail'] = 'Send email';
+$PALANG['pMenu_password'] = 'Adgangskode';
+$PALANG['pMenu_viewlog'] = 'Vis log';
$PALANG['pMenu_logout'] = 'Log ud';
$PALANG['pMain_welcome'] = 'Velkommen til Postfix Admin!';
-$PALANG['pMain_overview'] = 'Vis alle aliaser og postbokse. Du kan redigere / slette dem herfra.';
-$PALANG['pMain_create_alias'] = 'Opret nyt alias til dit domæne.';
-$PALANG['pMain_create_mailbox'] = 'Opret nu postboks til dit domæne.';
+$PALANG['pMain_overview'] = 'Vis alle aliaser og postbokse. Du kan redigere/slette dem herfra.';
+$PALANG['pMain_create_alias'] = 'Opret nyt alias til dit domæne.';
+$PALANG['pMain_create_mailbox'] = 'Opret nu postboks til dit domæne.';
$PALANG['pMain_sendmail'] = 'Send en email til en af dine nyoprettede postbokse.';
-$PALANG['pMain_password'] = 'Ret kodeordet til din administratorkonto.';
+$PALANG['pMain_password'] = 'Ændre adgangskoden til din administratorkonto.';
$PALANG['pMain_viewlog'] = 'Vis logfiler.';
-$PALANG['pMain_logout'] = 'Log ud fra systemet';
+$PALANG['pMain_logout'] = 'Log ud fra systemet.';
-$PALANG['pOverview_disabled'] = 'Disabled';
-$PALANG['pOverview_unlimited'] = 'Unlimited';
-$PALANG['pOverview_title'] = ':: Defined Domains';
-$PALANG['pOverview_up_arrow'] = 'Go Top';
-$PALANG['pOverview_right_arrow'] = 'Next Page';
-$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_disabled'] = 'Deaktiveret';
+$PALANG['pOverview_unlimited'] = 'Ubegrænset';
+$PALANG['pOverview_title'] = ':: Oprettede domæner';
+$PALANG['pOverview_up_arrow'] = 'Gå til top';
+$PALANG['pOverview_right_arrow'] = 'Næste side';
+$PALANG['pOverview_left_arrow'] = 'Foregående side';
$PALANG['pOverview_alias_title'] = ':: Alias';
-$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
+$PALANG['pOverview_mailbox_title'] = ':: Postbokse';
$PALANG['pOverview_button'] = 'Vis';
$PALANG['pOverview_welcome'] = 'Oversigt for ';
$PALANG['pOverview_alias_alias_count'] = 'Aliaser';
$PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
$PALANG['pOverview_alias_address'] = 'Fra';
$PALANG['pOverview_alias_goto'] = 'Til';
-$PALANG['pOverview_alias_modified'] = 'Senest rettet';
-$PALANG['pOverview_alias_active'] = 'Active'; # XXX
-$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
-$PALANG['pOverview_mailbox_username'] = 'Email';
+$PALANG['pOverview_alias_modified'] = 'Senest ændret';
+$PALANG['pOverview_alias_active'] = 'Aktiveret';
+$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
$PALANG['pOverview_mailbox_name'] = 'Navn';
$PALANG['pOverview_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pOverview_mailbox_modified'] = 'Senest rettet';
+$PALANG['pOverview_mailbox_modified'] = 'Senest ændret';
$PALANG['pOverview_mailbox_active'] = 'Aktiv';
-$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
-$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
+$PALANG['pOverview_vacation_edit'] = 'Autosvar er aktiveret';
+$PALANG['pOverview_vacation_option'] = 'Opret autosvar';
-$PALANG['pOverview_get_domain'] = 'Domæne';
+
+$PALANG['pOverview_get_domain'] = 'Domæne';
$PALANG['pOverview_get_aliases'] = 'Aliaser';
$PALANG['pOverview_get_mailboxes'] = 'Postbokse';
$PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';
-$PALANG['pOverview_get_modified'] = 'Senest rettet';
+$PALANG['pOverview_get_modified'] = 'Senest ændret';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette denne post ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s er slettet.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen ';
-$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
-$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset ';
-$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit domæne.';
+$PALANG['pCreate_alias_welcome'] = 'Opret nyt alias til dit domæne.';
$PALANG['pCreate_alias_address'] = 'Alias';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldigt!</span>';
-$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Email adressen eksisterer allerede. Vælg venligst en anden!</span>';
-$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliaser til dit domæne!</span>';
+$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af aliaser til dit domæne!</span>';
$PALANG['pCreate_alias_goto'] = 'Modtager';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_button'] = 'Tilføj Alias';
+$PALANG['pCreate_alias_active'] = 'Aktiv';
+$PALANG['pCreate_alias_button'] = 'Tilføj Alias';
$PALANG['pCreate_alias_goto_text'] = 'Hvor emailen skal videresendes til.';
$PALANG['pCreate_alias_goto_text_error'] = 'Hvor emailen skal videresendes til.<br /><span class="error_msg">Modtageradressen er ikke gyldig!</span>';
-$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen!</span>';
-$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet til alias-tabellen!';
-$PALANG['pCreate_alias_catchall_text'] = 'For at oprette et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-viderestilling brug "*@domain.tld" som modtager.';
+$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kan ikke tilføje aliaset til alias-tabellen!</span>';
+$PALANG['pCreate_alias_result_success'] = 'Aliaset er blevet tilføjet til alias-tabellen!';
+$PALANG['pCreate_alias_catchall_text'] = 'For at oprette et stjerne-alias, brug en "*" som alias.<br />For domæne til domæne-videresending brug "*@domain.tld" som modtager.';
-$PALANG['pEdit_alias_welcome'] = 'Rediger et alias for dit domæne.<br />En modtager pr. linie.';
+$PALANG['pEdit_alias_welcome'] = 'Rediger et alias for dit domæne.<br />En modtager pr. linje.';
$PALANG['pEdit_alias_address'] = 'Alias';
$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Kan ikke finde aliaset!</span>';
$PALANG['pEdit_alias_goto'] = 'Modtager(e)';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
+$PALANG['pEdit_alias_active'] = 'Aktiv';
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>';
-$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
-$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
-$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
-$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
+$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
+$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
+$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.';
+$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.';
$PALANG['pEdit_alias_button'] = 'Ret Alias';
$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke redigere aliaset!</span>';
-$PALANG['pCreate_mailbox_welcome'] = 'Opret en ny lokal postboks til dit domæne.';
+$PALANG['pCreate_mailbox_welcome'] = 'Opret en ny lokal postboks til dit domæne.';
$PALANG['pCreate_mailbox_username'] = 'Brugernavn';
-$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Email adressen er ikke gyldig!</span>';
-$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Email adressen eksisterer allerede. Vælg venligst en anden!</span>';
-$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af postbokse til dit domæne!</span>';
-$PALANG['pCreate_mailbox_password'] = 'Kodeord';
-$PALANG['pCreate_mailbox_password2'] = 'Kodeord (igen)';
-$PALANG['pCreate_mailbox_password_text'] = 'Kodeord til POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Kodeord til POP3/IMAP<br /><span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Emailadressen er ikke gyldig!</span>';
+$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Emailadressen eksisterer allerede. Vælg venligst en anden!</span>';
+$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nået grænsen for antallet af postbokse til dit domæne!</span>';
+$PALANG['pCreate_mailbox_password'] = 'Adgangskode';
+$PALANG['pCreate_mailbox_password2'] = 'Adgangskode (igen)';
+$PALANG['pCreate_mailbox_password_text'] = 'Adgangskode til POP3/IMAP';
+$PALANG['pCreate_mailbox_password_text_error'] = 'Adgangskode til POP3/IMAP<br /><span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
$PALANG['pCreate_mailbox_name'] = 'Navn';
$PALANG['pCreate_mailbox_name_text'] = 'Fulde navn';
$PALANG['pCreate_mailbox_quota'] = 'Kvota';
$PALANG['pCreate_mailbox_quota_text'] = 'MB';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
+$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
$PALANG['pCreate_mailbox_active'] = 'Aktiv';
$PALANG['pCreate_mailbox_mail'] = 'Send velkomsthilsen';
-$PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
-$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen!</span>';
-$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede underfoldere kunne oprettes.';
+$PALANG['pCreate_mailbox_button'] = 'Tilføj postboks';
+$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kan ikke tilføje postboksen til postboks-tabellen!</span>';
+$PALANG['pCreate_mailbox_result_success'] = 'Postboksen er tilføjet til postboks-tabellen!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Postkassen er tilføjet, men ingen (eller kun dele) af de foruddefinerede underfoldere kunne oprettes.';
-$PALANG['pEdit_mailbox_welcome'] = 'Rediger en postboks til dit domæne.';
+$PALANG['pEdit_mailbox_welcome'] = 'Rediger en postboks til dit domæne.';
$PALANG['pEdit_mailbox_username'] = 'Brugernavn';
$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Kan ikke finde postboksen!</span>';
-$PALANG['pEdit_mailbox_password'] = 'Nyt kodeord';
-$PALANG['pEdit_mailbox_password2'] = 'Nyt kodeord (igen)';
-$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!</span>';
+$PALANG['pEdit_mailbox_password'] = 'Ny adgangskode';
+$PALANG['pEdit_mailbox_password2'] = 'Ny adgangskode (igen)';
+$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!</span>';
$PALANG['pEdit_mailbox_name'] = 'Navn';
-$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
+$PALANG['pEdit_mailbox_name_text'] = 'Fulde navn';
$PALANG['pEdit_mailbox_quota'] = 'Kvota';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
-$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
-$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit: ';
+$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Den ønskede kvota er for høj!</span>';
+$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit: ';
$PALANG['pEdit_mailbox_button'] = 'Ret postboks';
-$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke skifte kodeord!</span>';
+$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>';
-$PALANG['pPassword_welcome'] = 'Ret dit kodeord.';
-$PALANG['pPassword_admin'] = 'Kodeord';
+$PALANG['pPassword_welcome'] = 'Ændre din adgangskode.';
+$PALANG['pPassword_admin'] = 'Adgangskode';
$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Brugernavnet kunne ikke findes!</span>';
-$PALANG['pPassword_password_current'] = 'Nuværende kodeord';
-$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive dit nuværende kodeord!</span>';
-$PALANG['pPassword_password'] = 'Nyt kodeord';
-$PALANG['pPassword_password2'] = 'Nyt kodeord (igen)';
-$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
-$PALANG['pPassword_button'] = 'Skift kodeord';
-$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke skifte kodeord!</span>';
-$PALANG['pPassword_result_success'] = 'Dit kodeord er skiftet!';
-$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
-$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
-$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
-$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
+$PALANG['pPassword_password_current'] = 'Nuværende adgangskode';
+$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du glemte at skrive din nuværende adgangskode!</span>';
+$PALANG['pPassword_password'] = 'Ny adgangskode';
+$PALANG['pPassword_password2'] = 'Ny adgangskode (igen)';
+$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pPassword_button'] = 'Ændre adgangskode';
+$PALANG['pPassword_result_error'] = '<span class="error_msg">Kan ikke ændre adgangskoden!</span>';
+$PALANG['pPassword_result_success'] = 'Din adgangskode er ændret!';
+$PALANG['pEdit_vacation_set'] = 'Ændre / Opret autosvar';
+$PALANG['pEdit_vacation_remove'] = 'Fjern autosvar';
+
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Autosvarindstillinger kunne ikke opdateres!</span>';
+$PALANG['pVacation_result_removed'] = 'Autosvar er fjernet!';
+$PALANG['pVacation_result_added'] = 'Autosvar er aktiveret!';
+
$PALANG['pViewlog_welcome'] = 'Vis de sidste 10 poster for ';
$PALANG['pViewlog_timestamp'] = 'Tidsstempel';
$PALANG['pViewlog_username'] = 'Administrator';
-$PALANG['pViewlog_domain'] = 'Domæne';
+$PALANG['pViewlog_domain'] = 'Domæne';
$PALANG['pViewlog_action'] = 'Handling';
$PALANG['pViewlog_data'] = 'Data';
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
-$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
-$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
-$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
-$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
-$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
-$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
+$PALANG['pViewlog_action_create_mailbox'] = 'opret postboks';
+$PALANG['pViewlog_action_delete_mailbox'] = 'slet postboks';
+$PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv';
+$PALANG['pViewlog_action_create_alias'] = 'opret alias';
+$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
+$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
+$PALANG['pViewlog_action_edit_alias_active'] = 'ændre alias aktiv';
+$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode';
+
$PALANG['pViewlog_button'] = 'Vis';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Kan ikke finde loggen!</span>';
$PALANG['pSendmail_welcome'] = 'Send en email.';
$PALANG['pSendmail_admin'] = 'Afsender';
$PALANG['pSendmail_to'] = 'Modtager';
-$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom eller en ugyldig email adresse!</span>';
+$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Modtager er tom eller en ugyldig emailadresse!</span>';
$PALANG['pSendmail_subject'] = 'Emne';
$PALANG['pSendmail_subject_text'] = 'Velkommen';
$PALANG['pSendmail_body'] = 'Meddelelse';
@@ -190,30 +196,30 @@
$PALANG['pSendmail_result_success'] = 'Postboksen er oprettet!';
$PALANG['pAdminMenu_list_admin'] = 'Administratorliste';
-$PALANG['pAdminMenu_list_domain'] = 'Domæneliste';
+$PALANG['pAdminMenu_list_domain'] = 'Domæneliste';
$PALANG['pAdminMenu_list_virtual'] = 'Virtuel Liste';
$PALANG['pAdminMenu_viewlog'] = 'Vis Log';
$PALANG['pAdminMenu_backup'] = 'Backup';
-$PALANG['pAdminMenu_create_domain_admins'] = 'Domæneadministrator';
+$PALANG['pAdminMenu_create_domain_admins'] = 'Domæneadministrator';
$PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
-$PALANG['pAdminMenu_create_domain'] = 'Nyt domæne';
-$PALANG['pAdminMenu_create_alias'] = 'Tilføj alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Tilføj postboks';
+$PALANG['pAdminMenu_create_domain'] = 'Nyt domæne';
+$PALANG['pAdminMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pAdminMenu_create_mailbox'] = 'Tilføj postboks';
-$PALANG['pAdminList_admin_domain'] = 'Domæne';
+$PALANG['pAdminList_admin_domain'] = 'Domæne';
$PALANG['pAdminList_admin_username'] = 'Administrator';
-$PALANG['pAdminList_admin_count'] = 'Domæner';
-$PALANG['pAdminList_admin_modified'] = 'Senest rettet';
+$PALANG['pAdminList_admin_count'] = 'Domæner';
+$PALANG['pAdminList_admin_modified'] = 'Senest ændret';
$PALANG['pAdminList_admin_active'] = 'Aktiv';
-$PALANG['pAdminList_domain_domain'] = 'Domæne';
+$PALANG['pAdminList_domain_domain'] = 'Domæne';
$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
$PALANG['pAdminList_domain_aliases'] = 'Aliaser';
$PALANG['pAdminList_domain_mailboxes'] = 'Postbokse';
$PALANG['pAdminList_domain_maxquota'] = 'Maks. kvota (MB)';
$PALANG['pAdminList_domain_transport'] = 'Transport';
$PALANG['pAdminList_domain_backupmx'] = 'Backup MX';
-$PALANG['pAdminList_domain_modified'] = 'Senest rettet';
+$PALANG['pAdminList_domain_modified'] = 'Senest ændret';
$PALANG['pAdminList_domain_active'] = 'Aktiv';
$PALANG['pAdminList_virtual_button'] = 'Vis';
@@ -222,17 +228,17 @@
$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Postbokse';
$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
-$PALANG['pAdminList_virtual_alias_modified'] = 'Senest rettet';
+$PALANG['pAdminList_virtual_alias_modified'] = 'Senest ændret';
$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvota (MB)';
-$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senest rettet';
+$PALANG['pAdminList_virtual_mailbox_modified'] = 'Senest ændret';
$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
-$PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
-$PALANG['pAdminCreate_domain_domain'] = 'Domæne';
-$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
+$PALANG['pAdminCreate_domain_welcome'] = 'Tilføj et nyt domæne';
+$PALANG['pAdminCreate_domain_domain'] = 'Domæne';
+$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domænet eksisterer allerede!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domænet er ugyldigt!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Beskrivelse';
$PALANG['pAdminCreate_domain_aliases'] = 'Aliaser';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
@@ -241,17 +247,18 @@
$PALANG['pAdminCreate_domain_maxquota'] = 'Maks. kvota';
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt';
$PALANG['pAdminCreate_domain_transport'] = 'Transport';
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport';
-$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard aliaser';
-$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX';
-$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
-$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>';
-$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
-$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domænet!</span>';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Præciser transport';
+$PALANG['pAdminCreate_domain_defaultaliases'] = 'Tilføj standard aliaser';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'Mailserveren er backup MX';
+$PALANG['pAdminCreate_domain_button'] = 'Tilføj domæne';
+$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kan ikke tilføje domæne!</span>';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
-$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
-$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>';
+
+$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
+$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
$PALANG['pAdminEdit_domain_aliases'] = 'Aliaser';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annuller | 0 = uendeligt';
@@ -260,52 +267,51 @@
$PALANG['pAdminEdit_domain_maxquota'] = 'Maks. kvota';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = annuller | 0 = uendeligt';
$PALANG['pAdminEdit_domain_transport'] = 'Transport';
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport';
-$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Præciser transport';
+$PALANG['pAdminEdit_domain_backupmx'] = 'Mailserveren er backup MX';
$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
-$PALANG['pAdminEdit_domain_button'] = 'Rediger domæne';
-$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette domæne!</span>';
+$PALANG['pAdminEdit_domain_button'] = 'Rediger domæne';
+$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kan ikke rette domæne!</span>';
-$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj ny domæneadministrator';
+$PALANG['pAdminCreate_admin_welcome'] = 'Tilføj ny domæneadministrator';
$PALANG['pAdminCreate_admin_username'] = 'Administrator';
-$PALANG['pAdminCreate_admin_username_text'] = 'Email adresse';
-$PALANG['pAdminCreate_admin_username_text_error1'] = 'Email adresse<br /><span class="error_msg">Administrator er ikke en gyldig email adresse!</span>';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Email adresse<br /><span class="error_msg">Aministratoren findes allerede eller er ikke gyldig</span>';
-$PALANG['pAdminCreate_admin_password'] = 'Kodeord';
-$PALANG['pAdminCreate_admin_password2'] = 'Kodeord (igen)';
-$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
-$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
-$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan ikke tilføje administrator!</span>';
-$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilføjet!';
-$PALANG['pAdminCreate_admin_address'] = 'Domæne';
+$PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'Emailadresse<br /><span class="error_msg">Administrator er ikke en gyldig emailadresse!</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Emailadresse<br /><span class="error_msg">Aministratoren findes allerede eller er ikke gyldig</span>';
+$PALANG['pAdminCreate_admin_password'] = 'Adgangskode';
+$PALANG['pAdminCreate_admin_password2'] = 'Adgangskode (igen)';
+$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
+$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kan ikke tilføje administrator!</span>';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administrator er tilføjet!';
+$PALANG['pAdminCreate_admin_address'] = 'Domæne';
-
-$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en domæneadministrator';
+$PALANG['pAdminEdit_admin_welcome'] = 'Rediger en domæneadministrator';
$PALANG['pAdminEdit_admin_username'] = 'Administrator';
-$PALANG['pAdminEdit_admin_password'] = 'Kodeord';
-$PALANG['pAdminEdit_admin_password2'] = 'Kodeord (igen)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Kodeordene er ikke ens!<br />Eller er tomme!</span>';
+$PALANG['pAdminEdit_admin_password'] = 'Adgangskode';
+$PALANG['pAdminEdit_admin_password2'] = 'Adgangskode (igen)';
+$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Adgangskoderne er ikke ens!<br />Eller er tomme!</span>';
$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin';
+$PALANG['pAdminEdit_admin_super_admin'] = 'Superadministrator';
$PALANG['pAdminEdit_admin_button'] = 'Rediger administrator';
$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Kan ikke rette administrator!</span>';
$PALANG['pAdminEdit_admin_result_success'] = 'Administrator er rettet!';
-$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre kodeord og viderestilling.';
+$PALANG['pUsersLogin_welcome'] = 'Postboksbruger: Login for at ændre adgangskode og videresending.';
$PALANG['pUsersLogin_username'] = 'Brugernavn (email)';
-$PALANG['pUsersLogin_password'] = 'Kodeord';
+$PALANG['pUsersLogin_password'] = 'Adgangskode';
$PALANG['pUsersLogin_button'] = 'Log ind';
-$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Verificer at du bruger din email adresse som brugernavn!';
-$PALANG['pUsersLogin_password_incorrect'] = 'Dit kodeord er ikke korrekt!';
+$PALANG['pUsersLogin_username_incorrect'] = 'Dit brugernavn er forkert. Tjek at du bruger din emailadresse som brugernavn!';
+$PALANG['pUsersLogin_password_incorrect'] = 'Din adgangskode er ikke korrekt!';
$PALANG['pUsersMenu_vacation'] = 'Autosvar';
-$PALANG['pUsersMenu_edit_alias'] = 'Rediger dine viderestillinger';
-$PALANG['pUsersMenu_password'] = 'Skift kodeord';
+$PALANG['pUsersMenu_edit_alias'] = 'Rediger dine videresendinger';
+$PALANG['pUsersMenu_password'] = 'Ændre adgangskode';
-$PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din email adresse.';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
-$PALANG['pUsersMain_edit_alias'] = 'Skift dine viderestillinger for email.';
-$PALANG['pUsersMain_password'] = 'Skift dit nuværende kodeord.';
+$PALANG['pUsersMain_vacation'] = 'Tilføj en "ikke tilstede" besked eller et autosvar til din emailadresse.';
+$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' er AKTIVERET, klik \'' . $PALANG['pUsersMenu_vacation'] . '\' for at ' . $PALANG['edit'] . '/fjerne';
+$PALANG['pUsersMain_edit_alias'] = 'Ændre dine videresendinger for email.';
+$PALANG['pUsersMain_password'] = 'Ændre din nuværende adgangskode.';
$PALANG['pUsersVacation_welcome'] = 'Autosvar.';
$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar indstillet!';
@@ -314,48 +320,53 @@
$PALANG['pUsersVacation_body'] = 'Meddelelse';
$PALANG['pUsersVacation_body_text'] = <<<EOM
Jeg er ikke tilstede i perioden <dato> til <dato>.
-I nødstilfælde kan <kontaktperson> kontaktes.
+I nødstilfælde kan <kontaktperson> kontaktes.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Tager afsted';
-$PALANG['pUsersVacation_button_back'] = 'Er kommet tilbage';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere dine autosvar indstillinger!</span>';
+$PALANG['pUsersVacation_button_back'] = 'Kommer tilbage';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere indstillinger for dit autosvar!</span>';
$PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
-$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
+$PALANG['pCreate_dbLog_createmailbox'] = 'opret postboks';
+$PALANG['pCreate_dbLog_createalias'] = 'opret alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'slet alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'slet postboks';
-$PALANG['pEdit_dbLog_editactive'] = 'change active state';
-$PALANG['pEdit_dbLog_editalias'] = 'edit alias';
-$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox';
+$PALANG['pEdit_dbLog_editactive'] = 'ændre aktivtilstand';
+$PALANG['pEdit_dbLog_editalias'] = 'rediger alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'rediger postboks';
-$PALANG['pSearch'] = 'search'; # XXX
-$PALANG['pSearch_welcome'] = 'Searching for: ';
-$PALANG['pReturn_to'] = 'Return to'; # XXX
-$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
-$PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
-$PALANG['pBroadcast_message'] = 'Message'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
-$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'BC message'; # XXX
-$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
-$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
-$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
-$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
-$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
-$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
+$PALANG['pSearch'] = 'søg';
+$PALANG['pSearch_welcome'] = 'Søg efter: ';
+$PALANG['pReturn_to'] = 'Tilbage til';
+
+$PALANG['pBroadcast_title'] = 'Rundsend meddelelse';
+$PALANG['pBroadcast_from'] = 'Afsender';
+$PALANG['pBroadcast_name'] = 'Dit navn';
+$PALANG['pBroadcast_subject'] = 'Emne';
+$PALANG['pBroadcast_message'] = 'Meddelelse';
+$PALANG['pBroadcast_send'] = 'Send meddelelse';
+$PALANG['pBroadcast_success'] = 'Din meddelelse er rundsendt.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Rundsend meddelse';
+$PALANG['pBroadcast_error_empty'] = 'Felterne Dit navn, Emne og Meddelelse skal udfyldes!';
+
+$PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres ';
+$PALANG['pStatus_custom'] = 'Leveres til ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+
+$PALANG['pPasswordTooShort'] = "Adgangskoden er for kort - mindst %s tegn kræves";
+
+$PALANG['pFetchmail_welcome'] = 'Hent post for:';
+$PALANG['pFetchmail_new_entry'] = 'Ny regel';
+$PALANG['pFetchmail_database_save_error'] = 'Reglen kunne ikke gemmes in databasen!';
+$PALANG['pFetchmail_database_save_success'] = 'Reglen er gemt i databasen.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Reglen med ID %s eksisterer ikke!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Ugyldig postboks!';
+$PALANG['pFetchmail_server_missing'] = 'Angiv navnet på fjernserveren!';
+$PALANG['pFetchmail_user_missing'] = 'Angiv brugernavnet til fjernserveren!';
+$PALANG['pFetchmail_password_missing'] = 'Angiv adgangskoden til fjernserveren!';
+
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2007-11-08 21:21:16 UTC (rev 204)
+++ trunk/languages/ru.lang 2007-11-10 00:39:08 UTC (rev 205)
@@ -13,7 +13,7 @@
$PALANG['confirm'] = 'Вы уверены, что хотите удалить это?\n';
$PALANG['confirm_domain'] = 'Вы действительно хотите удалить все настройки для домена? Это действие нельзя будет отменить!\n';
$PALANG['check_update'] = 'Проверить обновление';
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
+$PALANG['invalid_parameter'] = 'Некорректный параметр!';
$PALANG['pFooter_logged_as'] = 'Вошли как %s';
@@ -77,7 +77,7 @@
$PALANG['pOverview_get_modified'] = 'Последнее изменение';
$PALANG['pDelete_delete_error'] = '<span class="error_msg">Невозможно удалить запись ';
-$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
+$PALANG['pDelete_delete_success'] = '%s удален.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Невозможно удалить ящик ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Этот домен не принадлежит вам ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Невозможно удалить алиас ';
@@ -359,13 +359,13 @@
$PALANG['pFetchmail_welcome'] = 'Собирать почту для:';
$PALANG['pFetchmail_new_entry'] = 'Новая запись';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Не удалось сохранить эту запись в базе данных!';
+$PALANG['pFetchmail_database_save_success'] = 'Запись сохранена в базе данных.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Не найдена запись с номером %s!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Некорректный почтовый ящик!';
+$PALANG['pFetchmail_server_missing'] = 'Пожалуйста введите имя удаленного сервера!';
+$PALANG['pFetchmail_user_missing'] = 'Пожалуйста введите имя удаленного пользователя!';
+$PALANG['pFetchmail_password_missing'] = 'Пожалуйста введите пароль удаленного пользователя!';
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-08 21:21:11
|
Revision: 204
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=204&view=rev
Author: GingerDog
Date: 2007-11-08 13:21:16 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
update debian stuff so i can sign the package
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/control
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-11-08 18:21:23 UTC (rev 203)
+++ trunk/debian/changelog 2007-11-08 21:21:16 UTC (rev 204)
@@ -2,5 +2,5 @@
* Initial Release (via dpkg)
- -- David Goodwin <da...@co...> Sun, 04 Nov 2007 15:36:00 +0000
+ -- David Goodwin <dav...@pa...> Sun, 04 Nov 2007 15:36:00 +0000
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2007-11-08 18:21:23 UTC (rev 203)
+++ trunk/debian/control 2007-11-08 21:21:16 UTC (rev 204)
@@ -1,7 +1,7 @@
Source: postfixadmin
Section: web
Priority: optional
-Maintainer: David Goodwin <da...@co...>
+Maintainer: David Goodwin <dav...@pa...>
Build-Depends: debhelper (>= 5)
Standards-Version: 3.7.2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-08 18:21:20
|
Revision: 203
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=203&view=rev
Author: GingerDog
Date: 2007-11-08 10:21:23 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
vacation.pl: do not send a vacation response if the mail has been previously classes as spam - assumes /^x-spam-flag:\s+yes$/i matches in the message
Modified Paths:
--------------
trunk/VIRTUAL_VACATION/vacation.pl
Modified: trunk/VIRTUAL_VACATION/vacation.pl
===================================================================
--- trunk/VIRTUAL_VACATION/vacation.pl 2007-11-05 23:23:19 UTC (rev 202)
+++ trunk/VIRTUAL_VACATION/vacation.pl 2007-11-08 18:21:23 UTC (rev 203)
@@ -325,6 +325,7 @@
elsif (/^cc:\s+(.*)\n$/i) { $cc = $1; $lastheader = \$cc; }
elsif (/^subject:\s+(.*)\n$/i) { $subject = $1; $lastheader = \$subject; }
elsif (/^message-id:\s+(.*)\n$/i) { $messageid = $1; $lastheader = \$messageid; }
+ elsif (/^x-spam-flag:\s+yes$/i) { exit (0); }
elsif (/^precedence:\s+(bulk|list|junk)/i) { exit (0); }
elsif (/^x-loop:\s+postfix\ admin\ virtual\ vacation/i) { exit (0); }
else {$lastheader = "" ; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-05 23:23:23
|
Revision: 202
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=202&view=rev
Author: christian_boltz
Date: 2007-11-05 15:23:19 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
- rename placeholder {UTF_8} to the more obvious {UTF-8}
This also fixes my last commit ;-)
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2007-11-05 22:07:02 UTC (rev 201)
+++ trunk/upgrade.php 2007-11-05 23:23:19 UTC (rev 202)
@@ -93,7 +93,7 @@
'{UNSIGNED}' => 'unsigned' ,
'{FULLTEXT}' => 'FULLTEXT',
'{BOOLEAN}' => 'tinyint(1) NOT NULL',
- '{UTF_8}' => '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */',
+ '{UTF-8}' => '/*!40100 CHARACTER SET utf8 COLLATE utf8_unicode_ci */',
'{LATIN1}' => '/*!40100 CHARACTER SET latin1 COLLATE latin1_swedish_ci */',
'{IF_NOT_EXISTS}' => 'IF NOT EXISTS',
'{RENAME_COLUMN}' => 'CHANGE COLUMN',
@@ -107,7 +107,7 @@
'{UNSIGNED}' => '',
'{FULLTEXT}' => '',
'{BOOLEAN}' => 'BOOLEAN NOT NULL',
- '{UTF_8}' => '', # TODO: UTF_8 is simply ignored.
+ '{UTF-8}' => '', # TODO: UTF-8 is simply ignored.
'{LATIN1}' => '', # TODO: same for latin1
'{IF_NOT_EXISTS}' => 'IF NOT EXISTS', # TODO: does this work with PgSQL?
'{RENAME_COLUMN}' => 'CHANGE COLUMN', # TODO: probably wrong
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-05 22:06:58
|
Revision: 201
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=201&view=rev
Author: christian_boltz
Date: 2007-11-05 14:07:02 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
- completed upgrade_81_mysql() (several changes in vacation table)
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2007-11-05 21:23:37 UTC (rev 200)
+++ trunk/upgrade.php 2007-11-05 22:07:02 UTC (rev 201)
@@ -294,31 +294,26 @@
}
function upgrade_81_mysql() { # MySQL only
-/* TODO
+ $table_vacation = table_by_key ('vacation');
+ $table_vacation_notification = table_by_key('vacation_notification');
-table vacation -
-- all varchar + text fields changed to utf8
-- active was tinyint (1), now (4)
-- ENGINE changed
-- DEFAULT CHARSET changed
-- COLLATE changed
+ $all_sql = split("\n", trim("
+ ALTER TABLE `$table_vacation` CHANGE `email` `email` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `subject` `subject` VARCHAR( 255 ) {UTF-8} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `body` `body` TEXT {UTF-8} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `cache` `cache` TEXT {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `domain` `domain` VARCHAR( 255 ) {LATIN1} NOT NULL
+ ALTER TABLE `$table_vacation` CHANGE `active` `active` TINYINT( 1 ) NOT NULL DEFAULT '1'
+ ALTER TABLE `$table_vacation` DEFAULT {LATIN1}
+ ALTER TABLE `$table_vacation` ENGINE = INNODB
+ "));
-diff:
- - `body` text NOT NULL default '',
- - `cache` text NOT NULL default '',
- + body text NOT NULL,
- + cache text NOT NULL,
- - `active` tinyint(1) NOT NULL default '1',
- + active tinyint(4) NOT NULL default '1', -> boolean are usually tinyint(1)
- -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation';
- +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci TYPE=InnoDB COMMENT='Postfix Admin - Virtual Vacation' ;
+ foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql, TRUE);
+ }
-
-
- */
-
db_query_parsed(
- " CREATE TABLE {IF_NOT_EXISTS} vacation_notification (
+ " CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
on_vacation varchar(255) NOT NULL,
notified varchar(255) NOT NULL,
notified_at timestamp NOT NULL default now(),
@@ -358,11 +353,12 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
MySQL:
-* vacation: DROP INDEX email
+* vacation:
+ - DROP INDEX email
+ - 'cache' field might be obsolete with vacation_notification - needs to be checked!
* vacation_notification:
- DEFAULT CHARSET and COLLATE should be changed
- change all varchar fields to latin1 (email addresses don't contain utf8 characters)
-* remove all DROP TABLE statements from DATABASE_*
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-05 21:23:39
|
Revision: 200
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=200&view=rev
Author: christian_boltz
Date: 2007-11-05 13:23:37 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
edit-vacation.php
- fix double-encoded special characters if language file contains
entity-encoded strings by html_entity_decode'ing the string
(will be encoded in template file later)
edit-vacation.tpl:
- encode tSubject with htmlentities() in template
Modified Paths:
--------------
trunk/edit-vacation.php
trunk/templates/edit-vacation.tpl
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/edit-vacation.php 2007-11-05 21:23:37 UTC (rev 200)
@@ -76,8 +76,8 @@
$tUseremail = $fUsername;
$tDomain = $fDomain;
- if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
- if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+ if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+ if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
}
@@ -103,8 +103,8 @@
}
$tUseremail = $fUsername;
- if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
- if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
+ if ($tSubject == '') { $tSubject = html_entity_decode($PALANG['pUsersVacation_subject_text'], ENT_QUOTES, 'UTF-8'); }
+ if ($tBody == '') { $tBody = html_entity_decode($PALANG['pUsersVacation_body_text'], ENT_QUOTES, 'UTF-8'); }
//if change, remove old one, then perhaps set new one
if (!empty ($fBack) || !empty ($fChange))
Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl 2007-11-04 22:52:16 UTC (rev 199)
+++ trunk/templates/edit-vacation.tpl 2007-11-05 21:23:37 UTC (rev 200)
@@ -19,7 +19,7 @@
</tr>
<tr>
<td><?php print $PALANG['pUsersVacation_subject'] . ":"; ?></td>
- <td><textarea class="flat" cols="60" name="fSubject" ><?php print $tSubject; ?></textarea></td>
+ <td><textarea class="flat" cols="60" name="fSubject" ><?php print htmlentities($tSubject, ENT_QUOTES, 'UTF-8'); ?></textarea></td>
<td> </td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-04 22:52:11
|
Revision: 199
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=199&view=rev
Author: christian_boltz
Date: 2007-11-04 14:52:16 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
functions.inc.php
- encode_header(): made charset parameter optional, defaults to utf-8
- db_delete(): escape_string() $where and $delete
create-mailbox.php:
- always encode mail header and insert Content-Type etc. headers
(previous code never did this, $PALANG['charset'] is not set in any
language. so this code part was never used)
sendmail.php:
- always encode mail header and insert Content-Type etc. headers
(had the same bug as create-mailbox.php)
- merge GET and POST
These changes fix
http://sourceforge.net/tracker/index.php?func=detail&aid=1811214&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/create-mailbox.php
trunk/functions.inc.php
trunk/sendmail.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/create-mailbox.php 2007-11-04 22:52:16 UTC (rev 199)
@@ -210,7 +210,6 @@
Lines starting with /* were inserted to keep this section in commented mode.
- $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir',$quota,'$fDomain',NOW(),NOW(),'$sqlActive')");
if ($result['rows'] != 1)
{
$tDomain = $fDomain;
@@ -311,18 +310,11 @@
$fHeaders = "To: " . $fTo . "\n";
$fHeaders .= "From: " . $fFrom . "\n";
- if (!empty ($PALANG['charset']))
- {
- $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text'], $PALANG['charset']) . "\n";
- $fHeaders .= "MIME-Version: 1.0\n";
- $fHeaders .= "Content-Type: text/plain; charset=" . $PALANG['charset'] . "\n";
- $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
- }
- else
- {
- $fHeaders .= "Subject: " . $PALANG['pSendmail_subject_text'] . "\n\n";
- }
-
+ $fHeaders .= "Subject: " . encode_header ($PALANG['pSendmail_subject_text']) . "\n";
+ $fHeaders .= "MIME-Version: 1.0\n";
+ $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+ $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
+
$fHeaders .= $CONF['welcome_text'];
if (!smtp_mail ($fTo, $fFrom, $fHeaders))
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/functions.inc.php 2007-11-04 22:52:16 UTC (rev 199)
@@ -900,7 +900,7 @@
// Action: Encode a string according to RFC 1522 for use in headers if it contains 8-bit characters.
// Call: encode_header (string header, string charset)
//
-function encode_header ($string, $default_charset)
+function encode_header ($string, $default_charset = "utf-8")
{
if (strtolower ($default_charset) == 'iso-8859-1')
{
@@ -1514,7 +1514,7 @@
//
function db_delete ($table,$where,$delete)
{
- $result = db_query ("DELETE FROM $table WHERE $where='$delete'");
+ $result = db_query ("DELETE FROM $table WHERE " . escape_string($where) . "='" . escape_string($delete) . "'");
if ($result['rows'] >= 1)
{
return $result['rows'];
Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php 2007-11-04 21:08:42 UTC (rev 198)
+++ trunk/sendmail.php 2007-11-04 22:52:16 UTC (rev 199)
@@ -37,43 +37,29 @@
(($CONF['sendmail'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
$SESSID_USERNAME = authentication_get_username();
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/sendmail.tpl");
- include ("./templates/footer.tpl");
-}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_POST['fTo'])) $fTo = escape_string ($_POST['fTo']);
+ $fTo = safepost('fTo');
$fFrom = $SESSID_USERNAME;
- if (isset ($_POST['fTo'])) $fHeaders = "To: " . $fTo . "\n";
- if (isset ($_POST['fTo'])) $fHeaders .= "From: " . $fFrom . "\n";
+ $fHeaders = "To: " . $fTo . "\n";
+ $fHeaders .= "From: " . $fFrom . "\n";
- if (!empty ($PALANG['charset']))
- {
- $fHeaders .= "Subject: " . encode_header (escape_string ($_POST['fSubject']), $PALANG['charset']) . "\n";
- $fHeaders .= "MIME-Version: 1.0\n";
- $fHeaders .= "Content-Type: text/plain; charset=" . $PALANG['charset'] . "\n";
- $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
- }
- else
- {
- $fHeaders .= "Subject: " . escape_string ($_POST['fSubject']) . "\n\n";
- }
+ $fHeaders .= "Subject: " . encode_header(safepost('fSubject')) . "\n";
+ $fHeaders .= "MIME-Version: 1.0\n";
+ $fHeaders .= "Content-Type: text/plain; charset=utf-8\n";
+ $fHeaders .= "Content-Transfer-Encoding: 8bit\n";
$fHeaders .= escape_string ($_POST['fBody']);
if (empty ($fTo) or !check_email ($fTo))
- {
+ {
$error = 1;
$tTo = escape_string ($_POST['fTo']);
$tSubject = escape_string ($_POST['fSubject']);
$tBody = escape_string ($_POST['fBody']);
$tMessage = $PALANG['pSendmail_to_text_error'];
- }
+ }
if ($error != 1)
{
@@ -86,10 +72,12 @@
$tMessage .= $PALANG['pSendmail_result_success'];
}
}
-
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/sendmail.tpl");
- include ("./templates/footer.tpl");
}
+
+include ("./templates/header.tpl");
+include ("./templates/menu.tpl");
+include ("./templates/sendmail.tpl");
+include ("./templates/footer.tpl");
+
+/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-04 21:08:37
|
Revision: 198
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=198&view=rev
Author: christian_boltz
Date: 2007-11-04 13:08:42 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
- clear float (no, motd right of the menu doesn't look good ;-)
Modified Paths:
--------------
trunk/templates/users_menu.tpl
Modified: trunk/templates/users_menu.tpl
===================================================================
--- trunk/templates/users_menu.tpl 2007-11-04 21:06:00 UTC (rev 197)
+++ trunk/templates/users_menu.tpl 2007-11-04 21:08:42 UTC (rev 198)
@@ -10,6 +10,8 @@
</ul>
</div>
+<br clear='all' /><br>
+
<?php
if (file_exists (realpath ("../motd-users.txt")))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-04 21:05:55
|
Revision: 197
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=197&view=rev
Author: christian_boltz
Date: 2007-11-04 13:06:00 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
- also read config.local.php when in /users/
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2007-11-04 21:02:26 UTC (rev 196)
+++ trunk/config.inc.php 2007-11-04 21:06:00 UTC (rev 197)
@@ -57,6 +57,7 @@
$CONF['database_tables'] = array (
'admin' => 'admin',
'alias' => 'alias',
+ 'config' => 'config',
'domain' => 'domain',
'domain_admins' => 'domain_admins',
'log' => 'log',
@@ -313,11 +314,15 @@
// that future updates work without problems, you can use a separate config
// file (config.local.php) instead of editing this file and override some
// settings there.
-if (file_exists (realpath ("./config.local.php"))) {
+if (file_exists (realpath ("./config.local.php"))) { # for /
include('config.local.php');
+} elseif (file_exists (realpath ("../config.local.php"))) { # for /users/
+ include('../config.local.php');
};
+
//
// END OF CONFIG FILE
//
+/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-04 21:02:21
|
Revision: 196
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=196&view=rev
Author: christian_boltz
Date: 2007-11-04 13:02:26 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
- remove DROP TABLE statements - they can do more harm than good
Modified Paths:
--------------
trunk/DATABASE_MYSQL.TXT
Modified: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT 2007-11-04 20:55:17 UTC (rev 195)
+++ trunk/DATABASE_MYSQL.TXT 2007-11-04 21:02:26 UTC (rev 196)
@@ -126,8 +126,6 @@
#
# Vacation stuff ...
#
-DROP TABLE IF EXISTS vacation;
-DROP TABLE IF EXISTS vacation_notification;
CREATE TABLE vacation (
email varchar(255) NOT NULL default '',
subject varchar(255) NOT NULL default '',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-11-04 20:55:15
|
Revision: 195
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=195&view=rev
Author: christian_boltz
Date: 2007-11-04 12:55:17 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
- renamed -$PALANG['pViewlog_action_edit_alias_state'] to
$PALANG['pViewlog_action_edit_alias_active'] - fixes undefined
messages in viewlog.php
- added some new strings to the language files
- pFetchmail_* strings were at the wrong location in several languages
- enforce at least one line of matching context in language-check.sh
This might cause rejects (especially if there are empty lines next to
the change), but avoids that strings are inserted at the wrong position
Modified Paths:
--------------
trunk/languages/bg.lang
trunk/languages/ca.lang
trunk/languages/cn.lang
trunk/languages/cs.lang
trunk/languages/da.lang
trunk/languages/de.lang
trunk/languages/en.lang
trunk/languages/es.lang
trunk/languages/et.lang
trunk/languages/eu.lang
trunk/languages/fi.lang
trunk/languages/fo.lang
trunk/languages/fr.lang
trunk/languages/hr.lang
trunk/languages/hu.lang
trunk/languages/is.lang
trunk/languages/it.lang
trunk/languages/language-update.sh
trunk/languages/lt.lang
trunk/languages/mk.lang
trunk/languages/nl.lang
trunk/languages/nn.lang
trunk/languages/pl.lang
trunk/languages/pt-br.lang
trunk/languages/ru.lang
trunk/languages/sk.lang
trunk/languages/sl.lang
trunk/languages/sv.lang
trunk/languages/tr.lang
trunk/languages/tw.lang
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/bg.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Ñèãóðíè ëè ñòå, ÷å æåëàåòå äà èçòðèåòî òîâà?\n';
$PALANG['confirm_domain'] = 'Íàèñòèíà ëè èñêàòå äà èçòðèåòå âñè÷êè çàïèñè çà òîçè äîìåéí? Òîâà äåéñòâèå å íåîáðàòèìî!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Àäìèíèñòðàòîðà ìîæå äà ñå ëîãíå îòòóê çà àäìèíèñòðèðàíå íà äîìåéí.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Íàïðåä';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_success'] = 'Âàøèÿò àâòîìàòè÷åí îòãîâîð áåøå ïðåìàõíàò!';
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/ca.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = '¿Segur que vols esborrar-lo?\n';
$PALANG['confirm_domain'] = 'Estas segur que vols borrar tots els registres d\'aquest domini? Això no podrà ser desfet!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Login d\'administrador per l\'administració de dominis.';
@@ -170,7 +171,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ves';
@@ -319,13 +320,6 @@
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Imposible actualitzar la configuració de la seva resposta automàtica!</span>';
$PALANG['pUsersVacation_result_success'] = 'La seva resposta automàtica ha estat esborrada!';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -353,6 +347,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/cn.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = '是否确定删除?\n';
$PALANG['confirm_domain'] = '你是否确定要删除该域中的所有记录? 删除后不可恢复!\n';
$PALANG['check_update'] = '检查新版本';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = '邮件管理员请从这里登录以管理你的域名.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '执行';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_success'] = '你的自动回复已经关闭!';
$PALANG['pCreate_dbLog_createmailbox'] = '新建邮箱';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = '新建别名';
$PALANG['pDelete_dbLog_deletealias'] = '删除别名';
$PALANG['pDelete_dbLog_deletemailbox'] = '邮件邮箱';
@@ -353,6 +347,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/cs.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -14,6 +14,7 @@
$PALANG['confirm'] = 'Jste si jistí?\n';
$PALANG['confirm_domain'] = 'Opravdu chcete smazat všechny záznamy v této doméně Tohle nelze vrátit!\n';
$PALANG['check_update'] = 'Zkontrolovat aktualizace';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Přihlášen jako %s';
@@ -177,7 +178,7 @@
$PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
$PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
$PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
-$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
+$PALANG['pViewlog_action_edit_alias_active'] = 'změna stavu přesměrování';
$PALANG['pViewlog_action_edit_password'] = 'změna hesla';
$PALANG['pViewlog_button'] = 'Jít';
@@ -323,13 +324,6 @@
EOM;
$PALANG['pUsersVacation_button_away'] = 'Odjet pryč';
$PALANG['pUsersVacation_button_back'] = 'Vrátit se';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nepodařilo se upravit nastavení!</span>';
$PALANG['pUsersVacation_result_success'] = 'Nastavení bylo upraveno!';
@@ -363,6 +357,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/da.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Er du sikker på du vil slette dette?\n';
$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster for dette domæne? Dette kan ikke fortrydes!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Postadministrator: Log ind her for at administrere dine domæner.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vis';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kan ikke opdatere dine autosvar indstillinger!</span>';
$PALANG['pUsersVacation_result_success'] = 'Dit autosvar er fjernet!';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -354,6 +348,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/de.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Sind Sie sicher dass Sie das löschen wollen?\n';
$PALANG['confirm_domain'] = 'Wollen Sie wirklich alle Einträge dieser Domain löschen? Dies kann NICHT rückgängig gemacht werden!\n';
$PALANG['check_update'] = 'Auf Updates überprüfen';
+$PALANG['invalid_parameter'] = 'Ungültiger Parameter!';
$PALANG['pFooter_logged_as'] = 'Angemeldet als %s';
@@ -175,7 +176,7 @@
$PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
$PALANG['pViewlog_action_delete_alias'] = 'Alias löschen';
$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
-$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_alias_active'] = 'Alias Aktiv bearbeiten';
$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
$PALANG['pViewlog_button'] = 'Los';
@@ -347,7 +348,7 @@
$PALANG['pBroadcast_send'] = 'Nachricht senden';
$PALANG['pBroadcast_success'] = 'Ihre Rundmail wurde gesendet.';
$PALANG['pAdminMenu_broadcast_message'] = 'Rundmail';
-$PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht d\xFCrfen nicht leer sein!';
+$PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht dürfen nicht leer sein!';
$PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR ';
$PALANG['pStatus_custom'] = 'Zustellung an ';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/en.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -13,6 +13,7 @@
$PALANG['confirm'] = 'Are you sure you want to delete this?\n';
$PALANG['confirm_domain'] = 'Do you really want to delete all records for this domain? This can not be undone!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!';
$PALANG['pFooter_logged_as'] = 'Logged as %s';
@@ -177,9 +178,9 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias';
$PALANG['pViewlog_action_delete_alias'] = 'delete alias';
$PALANG['pViewlog_action_edit_alias'] = 'edit alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active';
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active';
$PALANG['pViewlog_action_edit_password'] = 'change password';
-
+
$PALANG['pViewlog_button'] = 'Go';
$PALANG['pViewlog_result_error'] = '<span class="error_msg">Unable to find the logs!</span>';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/es.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = '¿Está seguro de que desea borrarlo?\n';
$PALANG['confirm_domain'] = '¿Está seguro de que desea borrar todos los registros de este dominio? ¡Esto no puede ser deshecho!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Login de administrador para administración de dominios.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
@@ -319,13 +320,6 @@
$PALANG['pUsersVacation_button_back'] = 'De vuelta';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">¡Imposible actualizar la configuración de su respuesta automática!</span>';
$PALANG['pUsersVacation_result_success'] = '¡Su respuesta automática ha sido borrada!';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
@@ -354,6 +348,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/et.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Oled kindel, et soovid seda kustutada?\n';
$PALANG['confirm_domain'] = 'Oled tõesti kindel, et tahad kustutada kõik kirjed sellele domeenile? Seda tegevust ei saa tagasi võtta!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'E-posti haldaja, logi siit domeeni administreerimiseks sisse.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Mine';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_button_away'] = 'Olen eemal alates';
$PALANG['pUsersVacation_button_back'] = 'Tulen tagasi';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Automaatse vastuse uuendamine ebaõnnestus!</span>';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pUsersVacation_result_success'] = 'Automaatne vastus on eemaldatud!';
$PALANG['pCreate_dbLog_createmailbox'] = 'postkasti loomine';
@@ -357,6 +351,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/eu.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Ziur al zaude ezabatu nahi duzula?\n';
$PALANG['confirm_domain'] = 'Ziur al zaude domeinu honetako erregistro guztiak ezbatu nahi dituzula? Hau ezin izango da desegin!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Kudeatzailearen logina domeinuak kudeatzeko.';
@@ -169,7 +170,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Joan';
@@ -319,13 +320,6 @@
$PALANG['pUsersVacation_result_success'] = 'Zure erantzun automatikoa borratu da!';
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -352,6 +346,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fi.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -4,6 +4,9 @@
// by Palo
//
+# XXX @translators: This file has several untranslated strings that are NOT marked with XXX
+# XXX Please check the whole file and remove this comment afterwards.
+
$PALANG['YES'] = 'Kyllä';
$PALANG['NO'] = 'Ei';
$PALANG['edit'] = 'muokkaa';
@@ -12,6 +15,7 @@
$PALANG['confirm'] = 'Oletko varma että haluat poistaa tämän?\n';
$PALANG['confirm_domain'] = 'Oletko varma että haluat poistaa kaikki tietueet tästä domainista? Tätä komentoa ei voi perua!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Kirjautuminen';
@@ -170,7 +174,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Siirry';
@@ -320,13 +324,6 @@
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -352,6 +349,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fo.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Ert tú vís(ur) í at tú vilt strika hetta?\n';
$PALANG['confirm_domain'] = 'Vilt tú veruliga strika allar upplýsingar fyri hetta navnaøki? Her kann ikki vendast aftur!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Umsitarar kunnu logga inn her fyri at umsita tykkara navnaøki.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vel';
@@ -320,13 +321,6 @@
Títt navn
EOM;
$PALANG['pUsersVacation_button_away'] = 'Burtur';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pUsersVacation_button_back'] = 'Heima';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Fái ikki broytt tínar frítíðarboð uppsetingar!</span>';
$PALANG['pUsersVacation_result_success'] = 'Títt frítíðarboð er strikað!';
@@ -358,6 +352,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/fr.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -14,6 +14,7 @@
$PALANG['confirm'] = 'Etes vous sur de vouloir supprimer cet enregistrement\n';
$PALANG['confirm_domain'] = 'Etes-vous sur de vouloir effacer tous les enregistrements dans ce domaine ? Cette opération ne pourra pas être annulée.\n';
$PALANG['check_update'] = 'Vérifiez les mises à jour';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Bonjour %s';
$PALANG['pLogin_welcome'] = 'Entrez votre adresse courriel pour administrer votre domaine.';
@@ -172,7 +173,7 @@
$PALANG['pViewlog_action_create_alias'] = 'créer un alias';
$PALANG['pViewlog_action_delete_alias'] = 'supprimer un alias';
$PALANG['pViewlog_action_edit_alias'] = 'éditer un alias';
-$PALANG['pViewlog_action_edit_alias_state'] = 'activer un alias';
+$PALANG['pViewlog_action_edit_alias_active'] = 'activer un alias';
$PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
$PALANG['pViewlog_button'] = 'Aller';
@@ -322,13 +323,6 @@
$PALANG['pUsersVacation_result_success'] = 'Votre réponse automatique a été enlevée!';
$PALANG['pCreate_dbLog_createmailbox'] = 'Création de compte';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'Création d\'alias';
$PALANG['pDelete_dbLog_deletealias'] = 'Suppression d\'alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'Suppression de compte';
@@ -355,6 +349,13 @@
$PALANG['pPasswordTooShort'] = "Mot de passe trop court. - %s caractères minimum";
$PALANG['pFetchmail_welcome'] = 'Récupérer le courrier pour :';
$PALANG['pFetchmail_new_entry'] = 'Nouvelle entrée';
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/hr.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -11,6 +11,7 @@
$PALANG['confirm'] = 'Da li ste sigurni da elite ovo pobrisati?\n';
$PALANG['confirm_domain'] = 'Da li ste sigurni da elite pobrisati sve zapise za tu domenu? Zapisi ce biti zauvijek pobrisani!\n';
$PALANG['check_update'] = 'Provjeri da li postoji novija inačica';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Administratori prijavite se ovdje.';
@@ -170,7 +171,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Idi';
@@ -319,13 +320,6 @@
$PALANG['pUsersVacation_result_success'] = 'Obvijest o odsutnosti je uklonjena!';
$PALANG['pCreate_dbLog_createmailbox'] = 'stvori potanski ormarić';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'stvori alias';
$PALANG['pDelete_dbLog_deletealias'] = 'pobrii alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'pobrii potanski ormarić';
@@ -351,6 +345,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/hu.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -11,7 +11,8 @@
$PALANG['exit'] = 'Kilép';
$PALANG['confirm'] = 'Biztos vagy benne hogy törlöd ezt?\n';
$PALANG['confirm_domain'] = 'Biztos hogy törölni akarod az összes bejegyzést ez alól a domain alól? Nem lehet visszahozni késõbb!\n';
-$PALANG['check_update'] = 'Check for update';
+$PALANG['check_update'] = 'Check for update'; # XXX
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = '%s-ként bejelentkezve';
@@ -176,7 +177,7 @@
$PALANG['pViewlog_action_create_alias'] = 'alias létrehozása';
$PALANG['pViewlog_action_delete_alias'] = 'alias törlése';
$PALANG['pViewlog_action_edit_alias'] = 'alias módosítása';
-$PALANG['pViewlog_action_edit_alias_state'] = 'alias aktivitás módosítása';
+$PALANG['pViewlog_action_edit_alias_active'] = 'alias aktivitás módosítása';
$PALANG['pViewlog_action_edit_password'] = 'jelszó módosítása';
$PALANG['pViewlog_button'] = 'Gyerünk';
@@ -322,13 +323,6 @@
Ez egy automatikus üzenet.
EOM;
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pUsersVacation_button_away'] = 'Automatikus válaszadás bekapcsolása';
$PALANG['pUsersVacation_button_back'] = 'Automatikus válaszadás kikapcsolása';
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Nem sikerült megváltoztatni az automatikus válasz konfigurációdat!</span>';
@@ -366,8 +360,14 @@
$PALANG['pFetchmail_welcome'] = 'Mail lehozása:';
$PALANG['pFetchmail_new_entry'] = 'Új bejegyzés';
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
-
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/is.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Ertu viss um að þú viljir eyða þessu?\n';
$PALANG['confirm_domain'] = 'Ertu viss um að þú viljir eyða öllu sem tengist þessu léni? Það er ekki hægt að bakka með aðgerðina!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Póst kerfisstjóri tengist hér til að viðhalda póstkerfi lénsins þins.';
@@ -170,7 +171,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Áfram';
@@ -320,13 +321,6 @@
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -352,6 +346,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/it.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Sei sicuro di volerlo cancellare?\n';
$PALANG['confirm_domain'] = 'Sei sicuro di voler cancellare tutti gli indirizzi di questo dominio? Questa modifica sarà permanente!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'GLi amministratori di posta devono effettuare il login qui per amministrare il proprio dominio.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Vai';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_success'] = 'La tua risposta automatica è stata tolta!';
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/language-update.sh
===================================================================
--- trunk/languages/language-update.sh 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/language-update.sh 2007-11-04 20:55:17 UTC (rev 195)
@@ -79,7 +79,7 @@
for file in $filelist ; do
test "$file" = "en.lang" && continue
- LANG=C diff -U1 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
+ LANG=C diff -U2 $file.strings en.lang.strings > $file.diff && echo "*** $file: no difference ***"
test $notext = 1 && cat $file.diff && continue
@@ -118,7 +118,7 @@
done > $file.patch
test $patch = 0 && cat $file.patch
- test $patch = 1 && patch $file < $file.patch
+ test $patch = 1 && patch --fuzz=1 $file < $file.patch
done
###############################################################################
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/lt.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -11,6 +11,7 @@
$PALANG['confirm'] = 'Tikrai norite šalinti?\n';
$PALANG['confirm_domain'] = 'Tikrai norite šalinti visus šios srities įrašus? Operacija negrįžtama!\n';
$PALANG['check_update'] = 'Patikrinti versiją';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Pašto srities administratorius.';
@@ -170,7 +171,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Eiti';
@@ -319,13 +320,6 @@
$PALANG['pUsersVacation_result_success'] = 'Auto atsakovas išjungtas!';
$PALANG['pCreate_dbLog_createmailbox'] = 'pašto dėžutė sukurta';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'sinonimas sukurtas';
$PALANG['pDelete_dbLog_deletealias'] = 'sinonimas pašalintas';
$PALANG['pDelete_dbLog_deletemailbox'] = 'pašto dėžutė pašalinta';
@@ -352,6 +346,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/mk.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Дали сте сигурни дека сакате да го избришете ова?\n';
$PALANG['confirm_domain'] = 'Дали сакате да ги избришете сите записи од овој домен? Ова не може да се поправи покасно!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Логин за администрирање на домени (Само за администратори!)';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Оди';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Не можам да ги променам сетирањата за автоматскиот одговор!</span>';
$PALANG['pUsersVacation_result_success'] = 'Вашиот автоматски одговор е отстранет!';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
@@ -354,6 +348,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/nl.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Weet u het zeker dat u wilt verwijderen?\n';
$PALANG['confirm_domain'] = 'Weet u zeker dat u ALLE waardes van het domein wilt verwijderen? Dit kan niet ongedaan worden gemaakt!\n';
$PALANG['check_update'] = 'Check for update';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Mail beheerders log hier in om uw domeinen te beheren.';
@@ -171,7 +172,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_active'] = 'edit alias active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ga';
@@ -320,13 +321,6 @@
$PALANG['pUsersVacation_result_success'] = 'Uw automatisch beantwoorder is verwijderd.';
$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox';
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['pCreate_dbLog_createalias'] = 'create alias';
$PALANG['pDelete_dbLog_deletealias'] = 'delete alias';
$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox';
@@ -353,6 +347,13 @@
$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
+$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
+$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
+$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
+$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
+$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
+$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
+$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2007-11-04 19:53:45 UTC (rev 194)
+++ trunk/languages/nn.lang 2007-11-04 20:55:17 UTC (rev 195)
@@ -12,6 +12,7 @@
$PALANG['confirm'] = 'Vil du slette dette?\n';
$PALANG['confirm_domain'] = 'Vil du virkelig slette alle poster og domenet?\n';
$PALANG['check_update'] = 'Se etter oppdatering';
+$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
$PALANG['pLogin_welcome'] = 'Postadministrator; Logg inn her for å administrere ditt domene';
@@ -169,7 +170,7 @@
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
-$PALANG['pViewlog_action_edit_alias_state'] = 'edit ali...
[truncated message content] |
|
From: <chr...@us...> - 2007-11-04 19:53:40
|
Revision: 194
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=194&view=rev
Author: christian_boltz
Date: 2007-11-04 11:53:45 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
- removed forgotten debugging code
Modified Paths:
--------------
trunk/search.php
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2007-11-04 19:46:37 UTC (rev 193)
+++ trunk/search.php 2007-11-04 19:53:45 UTC (rev 194)
@@ -92,7 +92,6 @@
if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
{
$query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
- echo $query;
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-04 19:46:33
|
Revision: 193
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=193&view=rev
Author: GingerDog
Date: 2007-11-04 11:46:37 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
search.php: remove dead code, fix for pgsql
Modified Paths:
--------------
trunk/search.php
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2007-11-04 19:35:09 UTC (rev 192)
+++ trunk/search.php 2007-11-04 19:46:37 UTC (rev 193)
@@ -89,23 +89,14 @@
}
-/*
-
- */
- if ($CONF['vacation_control_admin'] == 'YES')
+ if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
{
$query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
- # TODO: special query for pgsql needed?
+ echo $query;
}
else
{
$query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
- /* TODO: special query for pgsql really needed?
- if ('pgsql'==$CONF['database_type'])
- {
- $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
- }
- */
}
$result = db_query ($query);
@@ -117,15 +108,9 @@
{
if ('pgsql'==$CONF['database_type'])
{
- $row['created']=gmstrftime('%c %Z',$row['created']);
- $row['modified']=gmstrftime('%c %Z',$row['modified']);
- # TODO: code from admin/search.php
- # $row['created']=gmstrftime('%c %Z',$row['uts_created']);
- # $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
+ $row['created']=gmstrftime('%c %Z',strtotime($row['created']));
+ $row['modified']=gmstrftime('%c %Z',strtotime($row['modified']));
$row['active']=('t'==$row['active']) ? 1 : 0;
- # TODO: code from admin/search.php
- # unset($row['uts_created']);
- # unset($row['uts_modified']);
}
$tMailbox[] = $row;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-04 19:35:15
|
Revision: 192
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=192&view=rev
Author: GingerDog
Date: 2007-11-04 11:35:09 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
list-virtual.tpl: only display vacation stuff if vacation support is enabled
Modified Paths:
--------------
trunk/templates/list-virtual.tpl
Modified: trunk/templates/list-virtual.tpl
===================================================================
--- trunk/templates/list-virtual.tpl 2007-11-04 19:34:45 UTC (rev 191)
+++ trunk/templates/list-virtual.tpl 2007-11-04 19:35:09 UTC (rev 192)
@@ -236,7 +236,7 @@
$active = ($tMailbox[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
print " <td><a href=\"edit-active.php?username=" . urlencode ($tMailbox[$i]['username']) . "&domain=$fDomain" . "\">" . $active . "</a></td>\n";
- if ($CONF['vacation_control_admin'] == 'YES')
+ if ($CONF['vacation_control_admin'] == 'YES' && $CONF['vacation'] == 'YES')
{
$v_active_int = $tMailbox[$i]['v_active'];
if($v_active_int !== -1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-11-04 19:34:40
|
Revision: 191
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=191&view=rev
Author: GingerDog
Date: 2007-11-04 11:34:45 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
list-virtual.php: fix logic for display of vacation stuff
Modified Paths:
--------------
trunk/list-virtual.php
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2007-11-04 19:22:58 UTC (rev 190)
+++ trunk/list-virtual.php 2007-11-04 19:34:45 UTC (rev 191)
@@ -110,13 +110,14 @@
{
if ('pgsql'==$CONF['database_type'])
{
+ //var_dump($row);
$row['created']=gmstrftime('%c %Z',strtotime($row['created']));
$row['modified']=gmstrftime('%c %Z',strtotime($row['modified']));
$row['active']=('t'==$row['active']) ? 1 : 0;
- $row['v_active'] = 1; // default to off... TODO: 1 is NOT off
- if(isset($row['v_active'])) { /* key may not be present in results due to query from above */
- $row['v_active']=('t'==$row['v_active']) ? 1 : 0;
+ if($row['v_active'] == NULL) {
+ $row['v_active'] = 'f';
}
+ $row['v_active']=('t'==$row['v_active']) ? 1 : 0;
}
$tMailbox[] = $row;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
