diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 8ad8b6944477af99c389ffbbd1a90846085cafdd..5fecc8306f3ceca2cd06afb9b4507cd2b43fcee4 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -475,10 +475,10 @@ class passwordRecovery {
$ldap->search("(&(objectClass=gosaMailAccount)(uid=".$this->uid."))", array("dn"));
if ($ldap->count() < 1) {
- $this->message[] = sprintf(_("Did not found account %s"), $this->uid);
+ $this->message[] = sprintf(_('Did not found an account with login "%s"'), $this->uid);
return;
} elseif ($ldap->count() > 1) {
- $this->message[] = sprintf(_("Found multiple accounts %s"), $this->uid);
+ $this->message[] = sprintf(_('Found multiple accounts with login "%s"'), $this->uid);
return;
}
diff --git a/ihtml/themes/default/password.tpl b/ihtml/themes/default/password.tpl
index 90a41157c3098186c02fa00807aec5c97f14d92d..94945752774abaec103c20c40fca28d63d23d3ef 100644
--- a/ihtml/themes/default/password.tpl
+++ b/ihtml/themes/default/password.tpl
@@ -56,9 +56,9 @@
</tr>
{/if}
<tr>
- <td><label for="uid">{t}Username{/t}</label></td>
+ <td><label for="uid">{t}Login{/t}</label></td>
<td>{if $display_username}
- <input type="text" name="uid" id="uid" maxlength="40" value="{$uid}" title="{t}Username{/t}" onFocus="nextfield= 'current_password';">
+ <input type="text" name="uid" id="uid" maxlength="40" value="{$uid}" title="{t}Login{/t}" onFocus="nextfield= 'current_password';">
{else}
<i>{$uid}</i>
{/if}
diff --git a/ihtml/themes/default/recovery.tpl b/ihtml/themes/default/recovery.tpl
index 22daffabdb6bc43fbb363d2d2de28caad8dbb052..4b33fd923c5395164beed3a011c2d0a0dc42e03a 100644
--- a/ihtml/themes/default/recovery.tpl
+++ b/ihtml/themes/default/recovery.tpl
@@ -78,7 +78,7 @@
</tr>
{/if}
<tr>
- <td><label for="uid">{t}Username{/t}</label></td>
+ <td><label for="uid">{t}Login{/t}</label></td>
<td>
<i>{$uid}</i>
</td>
diff --git a/include/functions.inc b/include/functions.inc
index 8f053c75c11f7d21db82667ca4ba831051fb400c..dfd9617bb1853cf3aeaee838179c2f33135fd746 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -587,7 +587,7 @@ function ldap_login_user_htaccess ($username)
$ldap->search("(&(objectClass=gosaAccount)(uid=$username))", array("uid"));
/* Found no uniq match? Strange, because we did above... */
if ($ldap->count() != 1) {
- msg_dialog::display(_("LDAP error"), _("Username / UID is not unique inside the LDAP tree!"), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("LDAP error"), _("Login (uid) is not unique inside the LDAP tree!"), FATAL_ERROR_DIALOG);
return NULL;
}
$attrs = $ldap->fetch();
@@ -673,7 +673,7 @@ function ldap_login_user ($username, $password)
/* found more than one matching id */
default:
- msg_dialog::display(_("Internal error"), _("Username / UID is not unique inside the LDAP tree. Please contact your Administrator."), FATAL_ERROR_DIALOG);
+ msg_dialog::display(_("Internal error"), _("Login (uid) is not unique inside the LDAP tree. Please contact your administrator."), FATAL_ERROR_DIALOG);
return NULL;
}
diff --git a/plugins/admin/groups/class_group.inc b/plugins/admin/groups/class_group.inc
index 5ef539b81352148e00089a62803788343204fb53..13904d842b92020604da3e795a55c0e1bc8b00fc 100644
--- a/plugins/admin/groups/class_group.inc
+++ b/plugins/admin/groups/class_group.inc
@@ -521,13 +521,13 @@ class group extends plugin
$ldap->search("(&(objectClass=gosaAccount)(uid=".$uid."))",array("dn", "uid","sn","givenName"));
if($ldap->count() == 0 ){
msg_dialog::display(_("Error"),
- sprintf(_("Adding UID '%s' to group '%s' failed: cannot find user object!"),
+ sprintf(_('Adding user "%s" to group "%s" failed: cannot find user object!'),
$uid,$this->cn),
ERROR_DIALOG);
return;
}elseif($ldap->count() >= 2){
msg_dialog::display(_("Error"),
- sprintf(_("Add UID '%s' to group '%s' failed: UID is used more than once!"),
+ sprintf(_('Adding user "%s" to group "%s" failed: this login is used by more than one user!'),
$uid,$this->cn),
ERROR_DIALOG);
return;
@@ -597,7 +597,7 @@ class group extends plugin
count($this->memberUid) < $this->config->get_cfg_value("ldapFilterNestingLimit")){
foreach ($this->memberUid as $value){
if(!isset($this->members[$value])){
- $this->members[$value] = _("! unknown UID")." [".$value."]";
+ $this->members[$value] = _("! unknown user")." [".$value."]";
}
}
}else{
diff --git a/plugins/config/class_configInLdap.inc b/plugins/config/class_configInLdap.inc
index 635a0f4eb4b33aeb065bbf4651a73c4cf31c3da3..4775869ad2cf11bcc1dba971ca6b4aaa235f1fdb 100644
--- a/plugins/config/class_configInLdap.inc
+++ b/plugins/config/class_configInLdap.inc
@@ -108,7 +108,7 @@ class configInLdap extends simplePlugin
FALSE
),
new BooleanAttribute (
- _('schemaCheck'),
+ _('Schema check'),
_('Enables schema checking during login.'),
'fdSchemaCheck', FALSE,
FALSE
@@ -309,39 +309,39 @@ class configInLdap extends simplePlugin
'fdAccountRDN', FALSE
),
new StringAttribute (
- _('Automatic UIDs'), _('Automatic way to generate new user ids'),
+ _('Automatic logins'), _('Automatic way to generate new users logins'),
'fdIdGenerator', FALSE
),
new BooleanAttribute (
_('Strict naming policy'),
- _('Enables strict checking of uids and group names'),
+ _('Enables strict checking of user and group names'),
'fdStrictNamingRules', FALSE,
TRUE
),
new IntAttribute (
- _('GID/UID min id'),
- _('The minimum assignable user or group id number to avoid security leaks with uid 0 accounts.'),
+ _('Group/user min id'),
+ _('The minimum assignable user or group id to avoid security leaks with id 0 accounts.'),
'fdMinId', FALSE,
0, FALSE, 100
),
new StringAttribute (
- _('Next id hook'), _('A script to be called for finding the next free id number for users or groups externaly.'),
+ _('Next id hook'), _('A script to be called for finding the next free id number for users or groups.'),
'fdNextIdHook', FALSE
),
new IntAttribute (
- _('Number base for people'),
- _('Where to start looking for a new free user id number.'),
+ _('Base number for user id'),
+ _('Where to start looking for a new free user id.'),
'fdUidNumberBase', FALSE,
0, FALSE, 1100
),
new IntAttribute (
- _('Number base for groups'),
- _('Where to start looking for a new free group id number.'),
+ _('Base number for group id'),
+ _('Where to start looking for a new free group id.'),
'fdGidNumberBase', FALSE,
0, FALSE, 1100
),
new StringAttribute (
- _('Users RDN'), _('The branch where user are stored.'),
+ _('Users RDN'), _('The branch where users are stored.'),
'fdUserRDN', TRUE,
'ou=people'
),
@@ -356,28 +356,28 @@ class configInLdap extends simplePlugin
'ou=aclroles'
),
new SelectAttribute (
- _('Id allocation method'), _('Method to allocate uid/gid numbers'),
+ _('Id allocation method'), _('Method to allocate user/group ids'),
'fdIdAllocationMethod', TRUE,
array('traditional', 'pool'), 'traditional',
array(_('Traditional'), _('Samba unix id pool'))
),
new IntAttribute (
- _('Pool uid min'), _('Minimum value for uid when using pool method'),
+ _('Pool user id min'), _('Minimum value for user id when using pool method'),
'fdUidNumberPoolMin', FALSE,
0, FALSE, 10000
),
new IntAttribute (
- _('Pool uid max'), _('Maximum value for uid when using pool method'),
+ _('Pool user id max'), _('Maximum value for user id when using pool method'),
'fdUidNumberPoolMax', FALSE,
0, FALSE, 40000
),
new IntAttribute (
- _('Pool gid min'), _('Minimum value for gid when using pool method'),
+ _('Pool group id min'), _('Minimum value for group id when using pool method'),
'fdGidNumberPoolMin', FALSE,
0, FALSE, 10000
),
new IntAttribute (
- _('Pool gid max'), _('Maximum value for gid when using pool method'),
+ _('Pool group id max'), _('Maximum value for group id when using pool method'),
'fdGidNumberPoolMax', FALSE,
0, FALSE, 40000
),
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index b7d6c8939c1b6da44e6ad4e557b096e0e9d31701..a7c9ed2c159d7c35881339090de91eba3a58f2ff 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1459,9 +1459,9 @@ class user extends plugin
),
"plProvidedAcls" => array(
- "sn" => _("Surname"),
- "givenName" => _("Given name"),
- "uid" => _("User identification"),
+ "sn" => _("Last name"),
+ "givenName" => _("First name"),
+ "uid" => _("Login"),
"personalTitle" => _("Personal title"),
"academicTitle" => _("Academic title"),
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index f980f36d22617363378217d0e981dd9afa2d7af5..c3bc00536628bc22e55fbbc8eb6655778437505f 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -96,16 +96,16 @@ class posixAccount extends simplePlugin
'posixStatus', FALSE
),
new BooleanAttribute(
- _('Force UID/GID'), _('Force UID and GID values for this user'),
+ _('Force user/group id'), _('Force user id and group id values for this user'),
'force_ids', FALSE
),
new IntAttribute(
- _('UID'), _('UID value for this user'),
+ _('User id'), _('User id value for this user'),
'uidNumber', FALSE,
0, FALSE, ''
),
new IntAttribute(
- _('GID'), _('GID value for this user'),
+ _('Group id'), _('Group id value for this user'),
'gidNumber', FALSE,
0, FALSE, ''
)
diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 9ab65ff36561e855855b70fc952d2e3a684da76a..3e91d6a60f2c7b72c2d0efcb390ff57e7b72c5c6 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -123,7 +123,7 @@ class Step_Config1 extends setup_step
$message = array();
if (isset($this->id_settings['minid_active']) && !is_numeric($this->id_settings['minid'])) {
- $message[] = sprintf(_("The specified value for '%s' must be a numeric value"), _("GID / UID min id"));
+ $message[] = sprintf(_("The specified value for '%s' must be a numeric value"), _("Group/user min id"));
}
if (preg_match("/,$/", $this->peopleou)) {
@@ -139,7 +139,7 @@ class Step_Config1 extends setup_step
}
if (!is_numeric($this->uidbase)) {
- $message[] = _("Uid base must be numeric");
+ $message[] = _("User id base must be numeric");
}
if (($this->pwd_rules['pwminlen_active']) && !is_numeric($this->pwd_rules['pwminlen'])) {
diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 1ec4cd0a303b10ba6654f30b2a125ed2efd1e394..3496433a61f6f5e09ae39a6a49f4658342c96221 100644
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -210,13 +210,13 @@ class Step_Migrate extends setup_step
$this->search_outside_groups();
$this->check_organizationalUnits();
- $this->checks['uidNumber_usage']['TITLE'] = _("Checking for duplicated UID numbers");
+ $this->checks['uidNumber_usage']['TITLE'] = _("Checking for duplicated user ids");
$this->checks['uidNumber_usage']['STATUS'] = FALSE;
$this->checks['uidNumber_usage']['STATUS_MSG'] = "";
$this->checks['uidNumber_usage']['ERROR_MSG'] = "";
$this->check_uidNumber();
- $this->checks['gidNumber_usage']['TITLE'] = _("Checking for duplicate GID numbers");
+ $this->checks['gidNumber_usage']['TITLE'] = _("Checking for duplicate group ids");
$this->checks['gidNumber_usage']['STATUS'] = FALSE;
$this->checks['gidNumber_usage']['STATUS_MSG'] = "";
$this->checks['gidNumber_usage']['ERROR_MSG'] = "";
diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index e54fc1ed144be393ad35516213d334336116949d..79d6fb393b03594a4b1a3754fd569af4588c9a35 100644
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -91,7 +91,7 @@
<div class='step4_container'>
<div class='step4_name'>
- {t}Automatic UIDs{/t}
+ {t}Automatic logins{/t}
</div>
<div class='step4_value'>
{if $id_settings.idgen_active == FALSE}
@@ -107,7 +107,7 @@
<div class='step4_container'>
<div class='step4_name'>
- {t}GID / UID min id{/t}
+ {t}Group/user min id{/t}
</div>
<div class='step4_value'>
{if $id_settings.minid_active == FALSE}
@@ -123,7 +123,7 @@
<div class='step4_container' style="margin-bottom:5px;">
<div class='step4_name'>
- {t}Number base for people/groups{/t}
+ {t}Base number for user/group id{/t}
</div>
<div class='step4_value'>
<input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>