Commit daf5ffbf authored by fred's avatar fred

Merge branch 'stable-0.9.9' into domainepublic

Conflicts:
	bureau/admin/main.php
	bureau/admin/menu.php
	bureau/admin/menu_adm.php
	bureau/admin/menu_aide.php
	bureau/admin/menu_brouteur.php
	bureau/admin/menu_sql.php
	bureau/admin/styles/base.css
	bureau/admin/webmail/index.php
	debian/alternc.config
	debian/alternc.postinst
	src/sqlbackup.sh
	src/update_domains.sh
parents be8fb06e 913e277c
......@@ -167,6 +167,7 @@ bureau/admin/menu_aide.php -text
bureau/admin/menu_brouteur.php -text
bureau/admin/menu_dom.php -text
bureau/admin/menu_ftp.php -text
bureau/admin/menu_lang.php -text
bureau/admin/menu_mail.php -text
bureau/admin/menu_mem.php -text
bureau/admin/menu_quota.php -text
......@@ -205,7 +206,6 @@ bureau/admin/stats_members.php -text
bureau/admin/styles/base.css -text
bureau/admin/template.php -text
bureau/admin/web_list.php -text
bureau/admin/webmail/.htaccess -text
bureau/admin/webmail/index.php -text
bureau/class/config.php -text
bureau/class/config_nochk.php -text
......@@ -235,6 +235,8 @@ bureau/locales/Makefile -text
bureau/locales/README -text
bureau/locales/de_DE/LC_MESSAGES/messages.po -text
bureau/locales/en_US/LC_MESSAGES/manual.po -text
bureau/locales/en_US/LC_MESSAGES/messages.po -text
bureau/locales/es_ES/LC_MESSAGES/manual.po -text
bureau/locales/es_ES/LC_MESSAGES/messages.po -text
bureau/locales/es_VE/LC_MESSAGES/manual.po -text
bureau/locales/es_VE/LC_MESSAGES/messages.po -text
......@@ -243,34 +245,49 @@ bureau/locales/fr_FR/LC_MESSAGES/messages.po -text
bureau/locales/manual.pot -text
bureau/locales/messages.pot -text
bureau/locales/pt_BR/LC_MESSAGES/messages.po -text
debian/NEWS -text
debian/README.Debian -text
debian/alternc-slave.config -text
debian/alternc-slave.dirs -text
debian/alternc-slave.install -text
debian/alternc-slave.links -text
debian/alternc-slave.lintian -text
debian/alternc-slave.logrotate -text
debian/alternc-slave.postinst -text
debian/alternc-slave.postrm -text
debian/alternc-slave.prerm -text
debian/alternc-slave.templates -text
debian/alternc.config -text
debian/alternc.cron.d -text
debian/alternc.dirs -text
debian/alternc.links -text
debian/alternc.lintian -text
debian/alternc.logrotate -text
debian/alternc.postinst -text
debian/alternc.postrm -text
debian/alternc.preinst -text
debian/alternc.prerm -text
debian/changelog -text
debian/compat -text
debian/config -text
debian/control -text
debian/copyright -text
debian/dirs -text
debian/docs -text
debian/lintian-override -text
debian/po/POTFILES.in -text
debian/po/fr.po -text
debian/po/templates.pot -text
debian/postinst -text
debian/postrm -text
debian/preinst -text
debian/prerm -text
debian/rules -text
debian/templates -text
etc/alternc/apache-ssl.conf -text
etc/alternc/apache.conf -text
etc/alternc/apache2-ssl.conf -text
etc/alternc/apache2.conf -text
etc/alternc/menulist.txt -text
etc/alternc/phpmyadmin.inc.php -text
etc/alternc/postfix.cf -text
etc/alternc/templates/alternc/bureau.conf -text
etc/alternc/templates/bind/automatic.conf -text
etc/alternc/templates/bind/named.conf -text
etc/alternc/templates/bind/named.conf.options -text
etc/alternc/templates/bind/slaveip.conf -text
etc/alternc/templates/bind/templates/mx.template -text
etc/alternc/templates/bind/templates/named.template -text
......@@ -280,7 +297,6 @@ etc/alternc/templates/courier/authdaemonrc -text
etc/alternc/templates/courier/authmysqlrc -text
etc/alternc/templates/default/saslauthd -text
etc/alternc/templates/postfix/ca.der -text
etc/alternc/templates/postfix/main.cf -text
etc/alternc/templates/postfix/myalias.cf -text
etc/alternc/templates/postfix/mydomain.cf -text
etc/alternc/templates/postfix/mygid.cf -text
......@@ -312,6 +328,7 @@ install/upgrades/0.9.5.sh -text
install/upgrades/0.9.5.sql -text
install/upgrades/0.9.6.sql -text
install/upgrades/0.9.7.sql -text
install/upgrades/0.9.9.sql -text
install/upgrades/README -text
man/alternc-admintools.8 -text
man/alternc-admintools.fr.8 -text
......@@ -328,7 +345,6 @@ po/alternc-admintools.pot -text
po/fr/LC_MESSAGES/alternc-admintools.po -text
/quota_delete -text
/quota_init -text
src/.cvsignore -text
src/Makefile -text
src/basedir_prot.sh -text
src/du.pl -text
......
......@@ -91,18 +91,31 @@ if ($error) {
$type = $db->f("type");
echo "<option value=\"$type\"";
if($type == 'default')
echo " selected";
echo " selected=\"selected\"";
echo ">$type</option>";
}
?></select>
</td>
</tr>
<? if (variable_get('hosting_tld')) { ?>
<tr>
<th colspan="2"><label><input type="checkbox" name="create_dom" value="1" />
<?php printf(_("Create the domain <b>username.%s</b>"),variable_get('hosting_tld')); ?></label></th>
</tr>
<th colspan="2">
<input type="checkbox" name="create_dom" value="1" />
<label><?php printf(_("Create the domain <b>username.%s</b>"),""); ?></label>
<select name="create_dom_list">
<?php if (variable_get('hosting_tld')) { ?>
<option value="<?php echo variable_get('hosting_tld'); ?>" selected="selected"><?php echo variable_get('hosting_tld'); ?></option>
<?php }
/* Enumeration des domaines : */
$domain=$dom->enum_domains();
reset($domain);
while (list($key,$val)=each($domain)) { ?>
<option value="<?php echo $val; ?>" > <?php echo $val?> </option>
<?php } ?>
</select>
</th>
</tr>
<tr>
<? } ?>
<td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Create a new member"); ?>" /></td>
</tr>
</table>
......
......@@ -59,16 +59,14 @@ if (!($u=$admin->add_mem($login, $pass, $nom, $prenom, $nmail, $canpass, $type))
*
* 1 = force = ne tient pas compte du whois ou des droits de tld
*/
if ($create_dom) {
if (variable_get("hosting_tld")) {
if (($create_dom == 1) && !is_null($create_dom_list)) {
# make sure we don't have multiple dots there
$dom->lock();
$dom->add_domain($login.".".preg_replace("/^\.\.*/", "", variable_get("hosting_tld")),1,1,1);
$dom->add_domain($login.".".preg_replace("/^\.\.*/", "", $create_dom_list),1,1,1);
$dom->unlock();
} else {
$err->log("no 'hosting_tld' variable defined in `variables` table, not creating domain");
}
}
$ftp->add_ftp($login,"",$pass,"/");
$mem->unsu();
......
......@@ -85,7 +85,7 @@ if($_POST["action"] == "add") {
continue;
list($type, $q) = explode(":", $key, 2);
$c[$type][$q] = abs(intval($val));
$c[$type][$q] = abs(floatval($val));
}
if($quota->setdefaults($c)) {
......
......@@ -39,7 +39,7 @@ include("head.php");
?>
</head>
<body>
<h3>Edition du sous-domaine http://<?php ecif($sub,$sub."."); echo $domain; ?> : </h3>
<h3><?php __("Edition du sous-domaine"); ?> http://<?php ecif($sub,$sub."."); echo $domain; ?> : </h3>
<?php
if ($error) {
echo "<p class=\"erroe\">$error</p></body></html>";
......@@ -50,7 +50,7 @@ include("head.php");
<!-- *****************************************
gestion du sous-domaine
-->
<h3>Sous-domaine http://<?php ecif($sub,$sub."."); echo $domain; ?></h3>
<h3><?php __("Sous-domaine"); ?> http://<?php ecif($sub,$sub."."); echo $domain; ?></h3>
<form action="dom_subdoedit.php" method="post" id="main" name="main">
<table border="0">
<tr>
......
......@@ -42,7 +42,6 @@ include("head.php");
<dd class="link"><a href="/transat/profile#account">Profil</a></dd>
<dd><a href="quota_show.php"><?php __("Show my quotas"); ?></a></dd>
<dd><a href="http://www.aide-alternc.org/" target="help"><?php __("Online help"); ?></a></dd>
<?php
$MENUPATH="/var/alternc/bureau/admin/";
$tt=fopen("menulist.txt","rb");
......@@ -54,7 +53,8 @@ while (!feof ($tt)) {
}
fclose($tt);
?>
<dd><a href="mem_logout.php" target="_parent"><?php __("Logout"); ?></a></dd>
</dl>
</body>
</html>
......@@ -32,12 +32,10 @@
/* ######### SUPER-ADMIN ########## */
/* ############################# */
if ($mem->checkRight())
{ ?>
<dt id="reseller">Reseller</dt>
if ($mem->checkRight()) { ?>
<dt id="reseller"><?php __("Administration"); ?></dt>
<dd><a href="adm_list.php"><?php __("Manage the members"); ?></a></dd>
<dd><a href="adm_panel.php"><?php __("Admin Control Panel"); ?></a></dd>
<dd><a href="adm_panel.php"><?php __("AlternC configuration"); ?></a></dd>
<dd><a target="_blank" href="/admin/sql/?server=2"><?php __("General SQL Admin"); ?></a></dd>
<dt id="reseller">Transat</dt>
<dd><a href="../transat/accounts/list/">Membres</a></dd>
......
......@@ -32,6 +32,5 @@
$q=$quota->getquota("ftp");
if ($q["t"]>0) {
?>
<dt id="ftp"><?php __("FTP accounts"); ?></dt>
<dd><a href="ftp_list.php"><?php __("FTP accounts"); ?></a></dd>
<?php } ?>
<?php
/*
$Id$
----------------------------------------------------------------------
AlternC - Web Hosting System
Copyright (C) 2002 by the AlternC Development Team.
http://alternc.org/
----------------------------------------------------------------------
Based on:
Valentin Lacambre's web hosting softwares: http://altern.org/
----------------------------------------------------------------------
LICENSE
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License (GPL)
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To read the license please visit http://www.gnu.org/copyleft/gpl.html
----------------------------------------------------------------------
Original Author of file:
Purpose of file:
----------------------------------------------------------------------
*/
?>
<dt id="language"><?php __('Languages'); ?>
<?php foreach($locales as $l) { ?>
<dd><a href="login.php?setlang=<?php echo $l; ?>" target="_top"><?php __($l); ?></a></dd>
<?php } ?>
</dt>
......@@ -28,7 +28,6 @@
----------------------------------------------------------------------
*/
?>
<dt id="settings"><?php __("Settings"); ?></dt>
<dt id="settings"><?php __("Other"); ?></dt>
<dd><a href="mem_param.php"><?php __("Settings"); ?></a></dd>
<dt id="logout"><?php __("Logout"); ?></dt>
<dd><a href="mem_logout.php" target="_parent"><?php __("Logout"); ?></a></dd>
<dd><a href="main.php"><?php __("Messages"); ?></a></dd>
......@@ -28,5 +28,4 @@
----------------------------------------------------------------------
*/
?>
<dt id="quota"><?php __("Show my quotas"); ?></dt>
<dd><a href="quota_show.php"><?php __("Show my quotas"); ?></a></dd>
......@@ -33,7 +33,6 @@ if ($r["t"]) {
<dt id="mysql">Bases de donn&eacute;es</dt>
<dd><a href="sql_users_list.php"><?php __("MySQL Users") ?></a></dd>
<dd><a href="sql_list.php"><?php __("Databases"); ?></a></dd>
<dd><a href="sql_users_list.php"><?php __("Users") ?></a></dd>
<dd><a target="_blank" href="sql_admin.php"><?php __("SQL Admin"); ?></a></dd>
<?php
}
?>
<?php }
......@@ -28,11 +28,13 @@
----------------------------------------------------------------------
*/
?>
<dt id="stats"><?php __("Web statistics"); ?></dt>
<?php
/* ############# STATS ############# */
$q=$quota->getquota("sta2");
$r=$quota->getquota("dom");
if ($q["t"]>0 && $r["u"]>0) {
?>
<dt id="stats"><?php __("Raw web statistics"); ?></dt>
<dd><a href="sta2_list.php"><?php __("Raw web statistics"); ?></a></dd>
<?php } ?>
<?php }
......@@ -30,5 +30,4 @@
/* ############# WEB ACCESS ############# */
?>
<dt id="web-access"><?php __("Protected folders"); ?></dt>
<dd><a href="hta_list.php"><?php __("Protected folders"); ?></a></dd>
......@@ -128,16 +128,19 @@ body#menu h3 {
#menu-list dt {
font-weight:bold;
color:#777;
font-size:.9em;
font-size:.8em;
/*margin: 4px 0 2px 0;*/
padding: 7px .1em 0 5px;
padding: 1px .1em 0 5px;
/*background-color: #ccc;*/
border-bottom: 2px solid #ccc;
/*border-bottom: 2px solid #ccc;*/
background-color:#bbb;
color:white;
}
#menu-list dd {
padding:0;
margin:0;
font-size: 1em;
font-size: .9em;
border-bottom: 1px solid #ccc;
}
#alternc-logo {
padding: .5em;
......
......@@ -238,8 +238,8 @@ class m_admin {
}
// Vérification de la conformité du login
$login=strtolower($login);
if (!ereg("^[a-z0-9-]*$",$login)) { //$
$err->raise("admin",10);
if (!ereg("^[a-z0-9]*$",$login)) { //$
$err->raise("admin", "Login can only contains characters a-z and 0-9");
return false;
}
if (strlen($login) > 16) {
......
......@@ -388,16 +388,6 @@ class m_dom {
$found = true;
}
break;
case "ca":
$ligne=ereg_replace(chr(10), "",ereg_replace(chr(13),"",ereg_replace(" ","", $ligne)));
if ($ligne=="Status:EXIST")
$found=true;
if (ereg("NS.-Hostname:", $ligne)) {
$tmp=strtolower(ereg_replace("NS.-Hostname:","", $ligne));
if ($tmp)
$server[]=$tmp;
}
break;
case "eu":
case "be":
$ligne=preg_replace("/^ *([^ ]*) \(.*\)$/","\\1",trim($ligne));
......@@ -426,12 +416,13 @@ class m_dom {
$server[]=$tmp;
}
break;
case "ca":
case "ws";
if (ereg('^[[:space:]]*Name servers:[[:space:]]*$', $ligne)) {
// found the server
$state = 1;
} elseif ($state) {
if ($ligne = ereg_replace('[[:space:]]', "", $ligne)) {
if (ereg('^[^%]', $ligne) && $ligne = ereg_replace('[[:space:]]', "", $ligne)) {
// first non-whitespace line is considered to be the nameservers themselves
$found = true;
$server[] = $ligne;
......
......@@ -52,9 +52,11 @@ class m_err {
*
* Cette fonction lance une erreur, l'ajoute dans les logs d'AlternC,
* et la met à disposition pour le bureau virtuel pour affichage ultérieur.
*
*
* @todo ne plus utiliser $error de façon numérique, nulle part
*
* @param integer $clsid Classe qui lève l'erreur
* @param integer $error Numéro de l'erreur
* @param mixed $error Numéro de l'erreur ou chaîne décrivant l'erreur
* @param string $param Paramètre chaine associé à l'erreur (facultatif)
* @return boolean TRUE si l'erreur est connue, FALSE sinon.
*
......@@ -64,7 +66,8 @@ class m_err {
if (_("err_".$clsid."_".$error)!="err_".$clsid."_".$error || is_string($error)) {
$this->clsid=$clsid;
$this->error=$error;
$this->param=$param;
$args = func_get_args();
$this->param=array_slice($args, 2);
$this->logerr();
return true;
} else {
......@@ -88,11 +91,18 @@ class m_err {
*/
function errstr() {
if (is_string($this->error)) {
$msg = sprintf(_("err_".$this->clsid."_generic: ")._($this->error)."\n",$this->param);
$str = _("err_".$this->clsid."_generic: ")._($this->error)."\n";
} else {
$str = _("err_".$this->clsid."_".$this->error)."\n";
}
$args = $this->param;
if (is_array($args)) {
array_unshift($args, $str);
$msg = call_user_func_array("sprintf", $args);
return $msg;
} else {
$msg = sprintf(_("err_".$this->clsid."_".$this->error)."\n",$this->param);
return $args;
}
return $msg;
}
/**
......@@ -130,7 +140,7 @@ class m_err {
global $mem,$cuid;
$f=@fopen($this->logfile,"ab");
if ($f) {
fputs($f,date("d/m/Y H:i:s")." - CALL - ");
fputs($f,date("d/m/Y H:i:s")." - " . $_SERVER['REMOTE_ADDR'] . " - CALL - ");
fputs($f,$mem->user["login"]." - ");
fputs($f,$clsid." - ".$function." - ".$param."\n");
fclose($f);
......
......@@ -161,7 +161,7 @@ class m_quota {
function setquota($ressource,$size) {
global $err,$db,$cuid;
$err->log("quota","setquota",$ressource."/".$size);
if (intval($size)==0) $size="0";
if (floatval($size)==0) $size="0";
if ($this->disk[$ressource]) {
// It's a disk resource, update it with shell command
exec("/usr/lib/alternc/quota_edit $cuid $size");
......
......@@ -49,6 +49,7 @@ msgstr "Neuer Mitglied"
#: ../admin/sql_passchg.php:51 ../admin/sql_users_add.php:54
#: ../admin/sql_users_list.php:95 ../admin/adm_list.php:76
#: ../admin/ftp_add.php:54 ../admin/ftp_list.php:68 ../admin/index.php:74
#: ../admin/ftp_list.php:79
msgid "Username"
msgstr ""
......@@ -91,12 +92,13 @@ msgstr ""
msgid "Account type"
msgstr ""
#: ../admin/adm_add.php:102
#: ../admin/adm_add.php:102 ../admin/adm_add.php:104
#, php-format
msgid "Create the domain <b>username.%s</b>"
msgstr ""
#: ../admin/adm_add.php:106 ../admin/adm_list.php:62 ../admin/adm_list.php:59
#: ../admin/adm_add.php:119
msgid "Create a new member"
msgstr ""
......@@ -144,7 +146,7 @@ msgstr ""
msgid "Passwords do not match"
msgstr ""
#: ../admin/adm_doadd.php:75
#: ../admin/adm_doadd.php:75 ../admin/adm_doadd.php:73
msgid "The new member has been successfully created"
msgstr ""
......@@ -357,7 +359,7 @@ msgstr ""
#: ../admin/adm_list.php:96 ../admin/adm_tld.php:75 ../admin/dom_edit.php:77
#: ../admin/ftp_list.php:70 ../admin/hta_edit.php:68 ../admin/hta_list.php:76
#: ../admin/mail_list.php:97 ../admin/sta2_list.php:67
#: ../admin/adm_list.php:95
#: ../admin/adm_list.php:95 ../admin/ftp_list.php:83
msgid "Edit"
msgstr ""
......@@ -385,7 +387,8 @@ msgstr ""
msgid "C"
msgstr ""
#: ../admin/adm_list.php:218 ../admin/ftp_list.php:77
#: ../admin/adm_list.php:218 ../admin/ftp_list.php:77 ../admin/ftp_list.php:66
#: ../admin/ftp_list.php:90
msgid "Delete checked accounts"
msgstr ""
......@@ -681,6 +684,7 @@ msgstr "Datei"
#: ../admin/sta2_edit_raw.php:58 ../admin/sta2_list.php:57
#: ../admin/bro_main.php:136 ../admin/bro_main.php:135
#: ../admin/bro_main.php:153 ../admin/ftp_add.php:59 ../admin/ftp_list.php:69
#: ../admin/ftp_list.php:82
msgid "Folder"
msgstr ""
......@@ -966,6 +970,7 @@ msgstr ""
#: ../admin/dom_edit.php:122 ../admin/dom_subedit.php:83
#: ../class/m_dom.php:551 ../class/m_dom.php:594 ../class/m_dom.php:559
#: ../class/m_dom.php:550
msgid "Webmail access"
msgstr ""
......@@ -1022,7 +1027,7 @@ msgid "You cannot add any new ftp account, your quota is over."
msgstr ""
#: ../admin/ftp_add.php:40 ../admin/ftp_list.php:47 ../admin/ftp_list.php:83
#: ../admin/ftp_add.php:51 ../admin/ftp_list.php:82
#: ../admin/ftp_add.php:51 ../admin/ftp_list.php:82 ../admin/ftp_list.php:60
msgid "Create a new ftp account"
msgstr ""
......@@ -1450,11 +1455,11 @@ msgstr ""
msgid "Your password has been successfully changed."
msgstr ""
#: ../admin/menu_adm.php:39
#: ../admin/menu_adm.php:39 ../admin/menu_adm.php:37
msgid "Manage the members"
msgstr ""
#: ../admin/menu_adm.php:41
#: ../admin/menu_adm.php:41 ../admin/menu_adm.php:39
msgid "General SQL Admin"
msgstr ""
......@@ -1470,7 +1475,7 @@ msgstr ""
msgid "FTP accounts"
msgstr ""
#: ../admin/menu_mail.php:37
#: ../admin/menu_mail.php:37 ../admin/menu_mail.php:36
msgid "Mailboxes"
msgstr ""
......@@ -1478,7 +1483,7 @@ msgstr ""
msgid "Settings"
msgstr ""
#: ../admin/menu_mem.php:33 ../admin/menu_mem.php:34
#: ../admin/menu_mem.php:33 ../admin/menu_mem.php:34 ../admin/menu.php:53
msgid "Logout"
msgstr ""
......@@ -1496,7 +1501,7 @@ msgstr ""
msgid "MySQL Users"
msgstr ""
#: ../admin/menu_sql.php:36 ../admin/menu_sql.php:35
#: ../admin/menu_sql.php:36 ../admin/menu_sql.php:35 ../admin/menu_sql.php:34
msgid "Databases"
msgstr ""
......@@ -1505,6 +1510,7 @@ msgid "SQL Admin"
msgstr ""
#: ../admin/menu_sta2.php:37 ../admin/menu_sta2.php:36
#: ../admin/menu_sta2.php:39
msgid "Raw web statistics"
msgstr ""
......@@ -1865,7 +1871,8 @@ msgid "Domain can be installed, force NO DNS hosting)"
msgstr ""
#: ../class/m_err.php:64 ../class/m_err.php:90 ../class/m_err.php:107
#: ../class/m_err.php:91 ../class/m_err.php:93
#: ../class/m_err.php:91 ../class/m_err.php:93 ../class/m_err.php:66
#: ../class/m_err.php:94 ../class/m_err.php:96
#, php-format
msgid "err_"
msgstr "err_"
......@@ -2207,6 +2214,47 @@ msgstr ""
msgid "Latest news"
msgstr ""
#: ../admin/menu_adm.php:36
msgid "Administration"
msgstr ""
#: ../admin/menu_adm.php:38
msgid "AlternC configuration"
msgstr ""
#: ../admin/menu_brouteur.php:33
msgid "Files and directories"
msgstr ""
#: ../admin/menu_lang.php:31
msgid "Languages"
msgstr ""
#: ../admin/menu_mem.php:31
msgid "Other"
msgstr ""
#: ../admin/menu_mem.php:33
msgid "Messages"
msgstr ""
#: ../admin/menu_sql.php:35
#, fuzzy
msgid "Users"
msgstr "Bentzt"
#: ../admin/menu_sta2.php:32
msgid "Web statistics"
msgstr ""
#: ../admin/dom_subedit.php:42
msgid "Edition du sous-domaine"
msgstr ""
#: ../admin/dom_subedit.php:53
msgid "Sous-domaine"
msgstr ""
#~ msgid "If you want to use a different language, click on the flag below"
#~ msgstr "Fr eine andere Sprache, click ber die Fahne"
......
This diff is collapsed.
This diff is collapsed.
......@@ -52,6 +52,7 @@ msgstr "A
#: ../admin/sql_passchg.php:51 ../admin/sql_users_add.php:54
#: ../admin/sql_users_list.php:95 ../admin/adm_list.php:76
#: ../admin/ftp_add.php:54 ../admin/ftp_list.php:68 ../admin/index.php:74
#: ../admin/ftp_list.php:79
msgid "Username"
msgstr "Nombre de usuario"
......@@ -98,12 +99,13 @@ msgstr "Direcci
msgid "Account type"
msgstr "Cuotas de la cuenta"
#: ../admin/adm_add.php:102
#: ../admin/adm_add.php:102 ../admin/adm_add.php:104
#, fuzzy, php-format
msgid "Create the domain <b>username.%s</b>"
msgstr "Crear esta nueva base de datos"
#: ../admin/adm_add.php:106 ../admin/adm_list.php:62 ../admin/adm_list.php:59
#: ../admin/adm_add.php:119
msgid "Create a new member"
msgstr "Crear un nuevo miembro"
......@@ -156,7 +158,7 @@ msgstr "Modificar las cuotas por defecto"
msgid "Passwords do not match"
msgstr ""
#: ../admin/adm_doadd.php:75
#: ../admin/adm_doadd.php:75 ../admin/adm_doadd.php:73
msgid "The new member has been successfully created"
msgstr "El nuevo miembro a sido creado con xito"
......@@ -382,7 +384,7 @@ msgstr ""
#: ../admin/adm_list.php:96 ../admin/adm_tld.php:75 ../admin/dom_edit.php:77
#: ../admin/ftp_list.php:70 ../admin/hta_edit.php:68 ../admin/hta_list.php:76
#: ../admin/mail_list.php:97 ../admin/sta2_list.php:67
#: ../admin/adm_list.php:95
#: ../admin/adm_list.php:95 ../admin/ftp_list.php:83
msgid "Edit"
msgstr "Modificar"
......@@ -410,7 +412,8 @@ msgstr "Q"
msgid "C"
msgstr "C"
#: ../admin/adm_list.php:218 ../admin/ftp_list.php:77
#: ../admin/adm_list.php:218 ../admin/ftp_list.php:77 ../admin/ftp_list.php:66
#: ../admin/ftp_list.php:90
msgid "Delete checked accounts"
msgstr "Suprimir las cuentas marcadas"
......@@ -719,6 +722,7 @@ msgstr "Archivo"
#: ../admin/sta2_edit_raw.php:58 ../admin/sta2_list.php:57
#: ../admin/bro_main.php:136 ../admin/bro_main.php:135
#: ../admin/bro_main.php:153 ../admin/ftp_add.php:59 ../admin/ftp_list.php:69
#: ../admin/ftp_list.php:82
msgid "Folder"
msgstr "Carpeta"
......@@ -1010,6 +1014,7 @@ msgstr "Dirigir hac
#: ../admin/dom_edit.php:122 ../admin/dom_subedit.php:83
#: ../class/m_dom.php:551 ../class/m_dom.php:594 ../class/m_dom.php:559
#: ../class/m_dom.php:550
msgid "Webmail access"
msgstr "Acceso Webmail"
......@@ -1074,7 +1079,7 @@ msgid "You cannot add any new ftp account, your quota is over."
msgstr "Su cuota de cuentas ftp alcanz su limite, no se puede crear ms."
#: ../admin/ftp_add.php:40 ../admin/ftp_list.php:47 ../admin/ftp_list.php:83
#: ../admin/ftp_add.php:51 ../admin/ftp_list.php:82
#: ../admin/ftp_add.php:51 ../admin/ftp_list.php:82 ../admin/ftp_list.php:60
msgid "Create a new ftp account"
msgstr "Crear una nueva cuenta ftp"
......@@ -1543,11 +1548,11 @@ msgstr "Modificar mis preferencias de administrador"
msgid "Your password has been successfully changed."
msgstr "La contrasea ha sido cambiada."
#: ../admin/menu_adm.php:39
#: ../admin/menu_adm.php:39 ../admin/menu_adm.php:37
msgid "Manage the members"
msgstr "Administrar miembros"
#: ../admin/menu_adm.php:41
#: ../admin/menu_adm.php:41 ../admin/menu_adm.php:39
msgid "General SQL Admin"
msgstr "Admin general SQL "
......@@ -1563,7 +1568,7 @@ msgstr "Dominio