From 79383d5f12c03077ad82ce8c97710933f6ab90dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Mon, 15 Dec 2014 14:51:06 +0100
Subject: [PATCH] =?UTF-8?q?Fixes=20#3516=20Removed=20occurences=20of=20?=
=?UTF-8?q?=C2=ABadministrative=C2=BB=20instead=20of=20administrator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
setup/class_setupStep_Migrate.inc | 10 +++++-----
setup/setup_migrate.tpl | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 3496433a6..7be7f6fc8 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -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
}
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index cd19c0b32..c4910b540 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -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>
--
GitLab