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] = '' . $this->attributes['sshPublicKey'][0] . ' ' . $this->attributes['sshPublicKey'][0] . ' ' . $this->attributes['sshPublicKey'][$i] . '