Commit 79383d5f authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3516 Removed occurences of «administrative» instead of administrator

parent 2b979daa
......@@ -845,7 +845,7 @@ class Step_Migrate extends setup_step
}
}
/* Try to find an old FD 1.0.7 administrative account that may be migrated */
/* Try to find an old FD 1.0.7 administrator account that may be migrated */
if (!$FD_1_0_8_found) {
$valid_users = "";
$valid_groups = "";
......@@ -945,7 +945,7 @@ class Step_Migrate extends setup_step
if ($FD_1_0_7_found) {
$str = "";
if (!empty($valid_groups)) {
$str .= "<i>".sprintf(_("FD 1.0.7 administrative accounts found: %s"), trim($valid_groups, ", "))."</i><br>";
$str .= "<i>".sprintf(_("FD 1.0.7 administrator accounts found: %s"), trim($valid_groups, ", "))."</i><br>";
}
$this->checks['acls']['STATUS'] = FALSE;
$this->checks['acls']['STATUS_MSG'] = _("Failed");
......@@ -1189,7 +1189,7 @@ class Step_Migrate extends setup_step
$ldap->cat($dn, array("dn"));
if ($ldap->count()) {
msg_dialog::display(_("Error"), sprintf(_("Adding an administrative user failed: object '%s' already exists!"), LDAP::fix($dn)), ERROR_DIALOG);
msg_dialog::display(_("Error"), sprintf(_("Adding an administrator user failed: object '%s' already exists!"), LDAP::fix($dn)), ERROR_DIALOG);
return FALSE;
}
......@@ -1439,7 +1439,7 @@ class Step_Migrate extends setup_step
}
/*************
* Administrative Account -- Migrate/Create
* Administrator Account -- Migrate/Create
*************/
if (isset($_POST['retry_acls'])) {
......@@ -2825,7 +2825,7 @@ class Step_Migrate extends setup_step
$this->migrate_users[$id]['checked'] = isset($_POST['migrate_admin_'.$id]);
}
/* Try to find an old GOsa 2.5 administrative account that may be migrated */
/* Try to find an old GOsa 2.5 administrator account that may be migrated */
if (!count($this->migrate_users)) {
//FIXME
}
......
......@@ -168,7 +168,7 @@
{elseif $method == "migrate_acls"}
<h2>{t}Migrate GOsa 2.5 administrative accounts{/t}</h2>
<h2>{t}Migrate GOsa 2.5 administrator accounts{/t}</h2>
<p>
{t}This dialog allows the migration of GOsa 2.5 admin accounts into FusionDirectory 1.0 useable accounts.{/t}
</p>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment