diff --git a/lam/help/help.inc b/lam/help/help.inc index e2dc0769..f2a09e45 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -98,7 +98,7 @@ $helpArray = array ( _("Use it at your own risk and read the documentation for lamdaemon before you use it!"). ""), "211" => array ("ext" => "FALSE", "Headline" => _("Configuration wizard") . " - " . _("Script server"), - "Text" => _("This is the server where the lamdaemon script is stored. LDAP Account Manager will make a SSH connection to this server with username and password provided at login."). + "Text" => _("This is the server where the lamdaemon script is stored. LDAP Account Manager will make a SSH connection to this server with user name and password provided at login."). "

". _("Use it at your own risk and read the documentation for lamdaemon before you use it!"). ""), diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index db24f4c6..70af6af1 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -302,7 +302,7 @@ function listGetAttributeArray($scope) { "uid" => _("User ID"), "uidnumber" => _("UID number"), "gidnumber" => _("GID number"), - "cn" => _("Username"), + "cn" => _("User name"), "host" => _("Allowed hosts"), "givenname" => _("First name"), "sn" => _("Last name"), @@ -323,7 +323,7 @@ function listGetAttributeArray($scope) { break; case 'host': return array ( - "uid" => _("Host username"), + "uid" => _("Host name"), "cn" => _("Host name"), "rid" => _("RID (Windows UID)"), "description" => _("Host description"), diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index f08066bc..1b39db93 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -137,7 +137,7 @@ class posixGroup extends baseModule { */ function display_html_attributes(&$post) { $return[] = array( - 0 => array('kind' => 'text', 'text' => _("Groupname").'*'), + 0 => array('kind' => 'text', 'text' => _("Group name").'*'), 1 => array('kind' => 'input', 'name' => 'cn', 'type' => 'text', 'size' => '20', 'maxlength' => '20', 'value' => $this->attributes['cn'][0]), 2 => array('kind' => 'help', 'value' => 'cn')); $return[] = array( @@ -381,8 +381,8 @@ class posixGroup extends baseModule { // help Entries $return['help'] = array( 'cn' => array( - "Headline" => _("Groupname"), - "Text" => _("Group name of the group which should be created. Valid characters are: a-z,0-9, .-_. Lam does not allow a number as first character because groupadd also does not allow it. Lam does not allow capital letters A-Z because it can cause several problems. If groupname is already used groupname will be expanded with a number. The next free number will be used.") + "Headline" => _("Group name"), + "Text" => _("Group name of the group which should be created. Valid characters are: a-z,0-9, .-_. LAM does not allow a number as first character because groupadd also does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. If group name is already used group name will be expanded with a number. The next free number will be used.") ), 'gidNumber' => array( "Headline" => _("GID number"), @@ -428,7 +428,7 @@ class posixGroup extends baseModule { * @see baseModule#get_pdfEntries */ function get_pdfEntries($account_type = "group") { - return array( 'posixGroup_cn' => array('' . _('Groupname') . '' . $this->attributes['cn'][0] . ''), + return array( 'posixGroup_cn' => array('' . _('Group name') . '' . $this->attributes['cn'][0] . ''), 'posixGroup_gidNumber' => array('' . _('GID number') . '' . $this->attributes['gidNumber'][0] . ''), 'posixGroup_memberUid' => array('' . _('Group members') . '' . $this->attributes['memberUid'][0] . ''), 'posixGroup_description' => array('' . _('Description') . '' . $this->attributes['description'][0] . '')); @@ -468,10 +468,10 @@ class posixGroup extends baseModule { $this->messages['gidNumber'][6] = array('ERROR', _('Maximum GID number'), _('Maximum GID number is invalid or empty!')); $this->messages['gidNumber'][7] = array('ERROR', _('Maximum GID number'), _('Maximum GID number must be greater than minimum GID number!')); $this->messages['gidNumber'][8] = array('ERROR', _('Account %s:') . ' posixGroup_gid', _('GID number has to be a numeric value!')); - $this->messages['cn'][0] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); - $this->messages['cn'][1] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.')); - $this->messages['cn'][2] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); - $this->messages['cn'][3] = array('ERROR', _('Account %s:') . ' posixGroup_cn', _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); + $this->messages['cn'][0] = array('WARN', _('Group name'), _('You are using a capital letters. This can cause problems because Windows isn\'t case-sensitive.')); + $this->messages['cn'][1] = array('WARN', _('Group name'), _('Group name in use. Selected next free group name.')); + $this->messages['cn'][2] = array('ERROR', _('Group name'), _('Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); + $this->messages['cn'][3] = array('ERROR', _('Account %s:') . ' posixGroup_cn', _('Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); $this->messages['memberUID'][0] = array('ERROR', _('Account %s:') . ' posixGroup_members', _("This value must be a list of user names separated by semicolons.")); } diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 0cedb711..cbc3b182 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -44,13 +44,13 @@ class sambaAccount extends baseModule { function load_Messages() { // error messages for input checks $this->messages['homePath'][0] = array('ERROR', _('Home path'), _('Home path is invalid.')); - $this->messages['homePath'][1] = array('INFO', _('Home path'), _('Inserted user- or groupname in HomePath.')); - $this->messages['homePath'][2] = array('INFO', _('Account %s:') . ' sambaAccount_homePath', _('Inserted user- or groupname in HomePath.')); + $this->messages['homePath'][1] = array('INFO', _('Home path'), _('Inserted user or group name in home path.')); + $this->messages['homePath'][2] = array('INFO', _('Account %s:') . ' sambaAccount_homePath', _('Inserted user or group name in home path.')); $this->messages['profilePath'][0] = array('ERROR', _('Profile path'), _('Profile path is invalid!')); - $this->messages['profilePath'][1] = array('INFO', _('Profile path'), _('Inserted user- or groupname in profilepath.')); - $this->messages['profilePath'][2] = array('INFO', _('Account %s:') . ' sambaAccount_profilePath', _('Inserted user- or groupname in profilepath.')); + $this->messages['profilePath'][1] = array('INFO', _('Profile path'), _('Inserted user or group name in profile path.')); + $this->messages['profilePath'][2] = array('INFO', _('Account %s:') . ' sambaAccount_profilePath', _('Inserted user or group name in profile path.')); $this->messages['logonScript'][0] = array('ERROR', _('Logon script'), _('Logon script is invalid!')); - $this->messages['logonScript'][1] = array('INFO', _('Logon script'), _('Inserted user- or groupname in logon script.')); + $this->messages['logonScript'][1] = array('INFO', _('Logon script'), _('Inserted user or group name in logon script.')); $this->messages['logonScript'][2] = array('ERROR', _('Account %s:') . ' sambaAccount_logonScript', _('Logon script is invalid!')); $this->messages['workstations'][0] = array('ERROR', _('Samba workstations'), _('Please enter a comma separated list of host names!')); $this->messages['workstations'][1] = array('ERROR', _('Account %s:') . ' sambaAccount_workstations', _('Please enter a comma separated list of host names!')); @@ -355,13 +355,13 @@ class sambaAccount extends baseModule { "Text" => _("Drive letter assigned on windows workstations as homedirectory.")), "homePath" => array( "ext" => "FALSE", "Headline" => _("Home path"), - "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "profilePath" => array( "ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "scriptPath" => array( "ext" => "FALSE", "Headline" => _("Logon script"), - "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "workstations" => array( "ext" => "FALSE", "Headline" => _("Samba workstations"), "Text" => _("Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), @@ -831,7 +831,7 @@ class sambaAccount extends baseModule { */ function get_pdfEntries($account_type = "user") { return array( 'sambaAccount_displayName' => array('' . _('Display name') . 'attributes['displayName'][0] . ''), - 'sambaAccount_uid' => array('' . _('Username') . '' . $this->attributes['uid'][0] . ''), + 'sambaAccount_uid' => array('' . _('User name') . '' . $this->attributes['uid'][0] . ''), 'sambaAccount_smbHome' => array('' . _('Home path') . '' . $this->attributes['smbHome'][0] . ''), 'sambaAccount_homeDrive' => array('' . _('Home drive') . '' . $this->attributes['homePath'][0] . ''), 'sambaAccount_scriptPath' => array('' . _('Logon script') . '' . $this->attributes['scriptPath'][0] . ''), diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index f565fa12..24b25608 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -270,7 +270,7 @@ class sambaGroupMapping extends baseModule { "Text" => _("This is the group name which will be shown in Windows.") ), 'sambaSID' => array( - "Headline" => _("Windows groupname"), + "Headline" => _("Windows group name"), "Text" => _("If you want to use a well known RID you can selcet a well known group.") ), 'rid' => array( diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index 696f858f..3dc27d5f 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -42,13 +42,13 @@ class sambaSamAccount extends baseModule { function load_Messages() { // error messages for input checks $this->messages['homePath'][0] = array('ERROR', _('Home path'), _('Home path is invalid.')); - $this->messages['homePath'][1] = array('INFO', _('Home path'), _('Inserted user- or groupname in HomePath.')); + $this->messages['homePath'][1] = array('INFO', _('Home path'), _('Inserted user or group name in home path.')); $this->messages['homePath'][2] = array('ERROR', _('Account %s:') . ' sambaSamAccount_homePath', _('Home path is invalid.')); $this->messages['profilePath'][0] = array('ERROR', _('Profile path'), _('Profile path is invalid!')); - $this->messages['profilePath'][1] = array('INFO', _('Profile path'), _('Inserted user- or groupname in profilepath.')); + $this->messages['profilePath'][1] = array('INFO', _('Profile path'), _('Inserted user or group name in profile path.')); $this->messages['profilePath'][2] = array('ERROR', _('Account %s:') . ' sambaSamAccount_profilePath', _('Profile path is invalid!')); $this->messages['logonScript'][0] = array('ERROR', _('Script path'), _('Script path is invalid!')); - $this->messages['logonScript'][1] = array('INFO', _('Script path'), _('Inserted user- or groupname in scriptpath.')); + $this->messages['logonScript'][1] = array('INFO', _('Script path'), _('Inserted user or group name in script path.')); $this->messages['logonScript'][2] = array('ERROR', _('Account %s:') . ' sambaSamAccount_logonScript', _('Logon script is invalid!')); $this->messages['workstations'][0] = array('ERROR', _('Samba workstations'), _('Please enter a comma separated list of host names!')); $this->messages['workstations'][1] = array('ERROR', _('Account %s:') . ' sambaSamAccount_workstations', _('Please enter a comma separated list of host names!')); @@ -170,13 +170,13 @@ class sambaSamAccount extends baseModule { "Text" => _("Drive letter assigned on windows workstations as homedirectory.")), "homePath" => array( "ext" => "FALSE", "Headline" => _("Home path"), - "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "profilePath" => array( "ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('Path of the user profile. Can be a local absolute path or a UNC-path (\\\\server\\share). $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "scriptPath" => array( "ext" => "FALSE", "Headline" => _("Logon script"), - "Text" => _('Filename and -path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user- and groupname.'). ' '. _("Can be left empty.")), + "Text" => _('File name and path relative to netlogon-share which should be executed on logon. $user and $group are replaced with user and group name.'). ' '. _("Can be left empty.")), "workstations" => array( "ext" => "FALSE", "Headline" => _("Samba workstations"), "Text" => _("Comma separated list of Samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), @@ -949,7 +949,7 @@ class sambaSamAccount extends baseModule { */ function get_pdfEntries($account_type = "user") { return array( 'sambaSamAccount_displayName' => array('' . _('Display name') . 'attributes['displayName'][0] . ''), - 'sambaSamAccount_uid' => array('' . _('Username') . '' . $this->attributes['uid'][0] . ''), + 'sambaSamAccount_uid' => array('' . _('User name') . '' . $this->attributes['uid'][0] . ''), 'sambaSamAccount_sambaHomePath' => array('' . _('Home path') . '' . $this->attributes['sambaHomeDrive'][0] . ''), 'sambaSamAccount_sambaHomeDrive' => array('' . _('Home drive') . '' . $this->attributes['sambaHomePath'][0] . ''), 'sambaSamAccount_sambaLogonScript' => array('' . _('Logon script') . '' . $this->attributes['sambaLogonScript'][0] . ''),