diff --git a/lam/lib/modules/imapAccess.inc b/lam/lib/modules/imapAccess.inc index c0e7dba3..c9f7959f 100644 --- a/lam/lib/modules/imapAccess.inc +++ b/lam/lib/modules/imapAccess.inc @@ -87,7 +87,7 @@ class imapAccess extends baseModule { "Headline" => _("Prefix for mailboxes"), "Text" => _("Some IMAP servers store mailboxes with a prefix (e.g. \"user\" for Cyrus which results in \"user.username\").")), 'ImapMailDomain' => array( - "Headline" => _("Mail domain(s)"), + "Headline" => _("Mail domains"), "Text" => _("Please enter a comma separated list of domain names (e.g. \"company.com,example.com\"). LAM will only manage mailboxes from these domains.")), 'ImapUserNameAttr' => array( "Headline" => _("User name attribute"), @@ -115,7 +115,7 @@ class imapAccess extends baseModule { $configPasswordType->setHasDescriptiveElements(true); $configContainer->addElement($configPasswordType, true); $configContainer->addElement(new htmlTableExtendedInputField(_('Prefix for mailboxes'), 'ImapAccess_ImapUserPrefix', '', 'ImapUserPrefix'), true); - $mailDomainsInput = new htmlTableExtendedInputField(_('Mail domain(s)'), 'ImapAccess_ImapDomain', '', 'ImapMailDomain'); + $mailDomainsInput = new htmlTableExtendedInputField(_('Mail domains'), 'ImapAccess_ImapDomain', '', 'ImapMailDomain'); $mailDomainsInput->setRequired(true); $configContainer->addElement($mailDomainsInput, true); $configUserName = new htmlTableExtendedSelect('ImapAccess_UserNameAttribute', array('mail', 'uid'), array('mail'), _("User name attribute"), 'ImapUserNameAttr'); diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc index e7977f8a..285d5954 100644 --- a/lam/lib/modules/ldapPublicKey.inc +++ b/lam/lib/modules/ldapPublicKey.inc @@ -78,7 +78,7 @@ class ldapPublicKey extends baseModule { ); // available PDF fields $return['PDF_fields'] = array( - 'sshPublicKey' => _('SSH public key(s)') + 'sshPublicKey' => _('SSH public keys') ); return $return; } @@ -173,7 +173,7 @@ class ldapPublicKey extends baseModule { function get_pdfEntries() { $return = array(); if (sizeof($this->attributes['sshPublicKey']) > 0) { - $return['ldapPublicKey_sshPublicKey'][0] = '' . _('SSH public key(s)') . '' . $this->attributes['sshPublicKey'][0] . ''; + $return['ldapPublicKey_sshPublicKey'][0] = '' . _('SSH public keys') . '' . $this->attributes['sshPublicKey'][0] . ''; for ($i = 1; $i < sizeof($this->attributes['sshPublicKey']); $i++) { $return['ldapPublicKey_sshPublicKey'][] = '' . $this->attributes['sshPublicKey'][$i] . ''; } diff --git a/lam/templates/3rdParty/pla/htdocs/add_value_form.php b/lam/templates/3rdParty/pla/htdocs/add_value_form.php index 3cd23ef2..8843c29e 100644 --- a/lam/templates/3rdParty/pla/htdocs/add_value_form.php +++ b/lam/templates/3rdParty/pla/htdocs/add_value_form.php @@ -88,7 +88,7 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST' echo ''; echo ''; - printf('%s',_('Enter the value(s) you would like to add:')); + printf('%s',_('Enter the values you would like to add:')); echo ''; if (! strcasecmp($request['attr'],'objectclass')) { diff --git a/lam/templates/3rdParty/pla/htdocs/delete_form.php b/lam/templates/3rdParty/pla/htdocs/delete_form.php index d82874c5..e3be6389 100644 --- a/lam/templates/3rdParty/pla/htdocs/delete_form.php +++ b/lam/templates/3rdParty/pla/htdocs/delete_form.php @@ -70,7 +70,7 @@ if (count($request['children'])) { //@todo need to refresh the tree after a delete printf('', sprintf(_('Delete all %s objects'),count($request['search'])), - (isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting Object(s)')) : '')); + (isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting objects')) : '')); echo ''; echo ''; @@ -122,7 +122,7 @@ if (count($request['children'])) { //@todo need to refresh the tree after a delete printf('', _('Delete'), - (isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting Object(s)')) : '')); + (isAjaxEnabled() ? sprintf('onclick="return ajSUBMIT(\'BODY\',document.getElementById(\'delete_form\'),\'%s\');"',_('Deleting objects')) : '')); echo ''; echo '';