Text improvement due to support request

This commit is contained in:
Philipp Dunkel 2009-12-20 22:41:21 +00:00
parent e1239e6c4e
commit 5b2687358b

View file

@ -67,7 +67,7 @@
if(mysql_num_rows($res) > 0) if(mysql_num_rows($res) > 0)
{ {
showheader(_("My CAcert.org Account!")); showheader(_("My CAcert.org Account!"));
printf(_("The email address '%s' is already in the system. Can't continue."), sanitizeHTML($_REQUEST['email'])); printf(_("The email address '%s' is already in a different account. Can't continue."), sanitizeHTML($_REQUEST['email']));
showfooter(); showfooter();
exit; exit;
} }
@ -457,7 +457,7 @@
$oldid=0; $oldid=0;
$id = 7; $id = 7;
showheader(_("My CAcert.org Account!")); showheader(_("My CAcert.org Account!"));
printf(_("The domain '%s' is already in the system and is listed as valid. Can't continue."), sanitizeHTML($newdomain)); printf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($newdomain));
showfooter(); showfooter();
exit; exit;
} }
@ -537,7 +537,7 @@
if(mysql_num_rows($res) > 0) if(mysql_num_rows($res) > 0)
{ {
showheader(_("My CAcert.org Account!")); showheader(_("My CAcert.org Account!"));
printf(_("The domain '%s' is already in the system and is listed as valid. Can't continue."), sanitizeHTML($_SESSION['_config']['domain'])); printf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($_SESSION['_config']['domain']));
showfooter(); showfooter();
exit; exit;
} }
@ -1987,7 +1987,7 @@
$res1 = mysql_query("select * from `orgdomains` where `domain`='$domain'"); $res1 = mysql_query("select * from `orgdomains` where `domain`='$domain'");
if(mysql_num_rows($res1) > 0) if(mysql_num_rows($res1) > 0)
{ {
$_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in the system and is listed as valid. Can't continue."), sanitizeHTML($domain)); $_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($domain));
$id = $oldid; $id = $oldid;
$oldid=0; $oldid=0;
} }
@ -2017,7 +2017,7 @@
$res2 = mysql_query("select * from `domains` where `domain` like '$domain' and `deleted`=0"); $res2 = mysql_query("select * from `domains` where `domain` like '$domain' and `deleted`=0");
if(mysql_num_rows($res1) > 0 || mysql_num_rows($res2) > 0) if(mysql_num_rows($res1) > 0 || mysql_num_rows($res2) > 0)
{ {
$_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in the system and is listed as valid. Can't continue."), sanitizeHTML($domain)); $_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($domain));
$id = $oldid; $id = $oldid;
$oldid=0; $oldid=0;
} }