diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
index 8bb4ed67..6fa7ad64 100644
--- a/lam/lib/modules/asteriskAccount.inc
+++ b/lam/lib/modules/asteriskAccount.inc
@@ -292,7 +292,7 @@ class asteriskAccount extends baseModule implements passwordService {
 		$configContainerOptions->addElement(new htmlOutputText(' '));
 		$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('asteriskAccount_hideAstAccountRegistrationContext', false, _('Registration context'), null, false));
 		$configContainerOptions->addElement(new htmlOutputText(' '));
-		$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('asteriskAccount_hideAstAccountRegistrationExten', false, _('Registration extention'), null, false));
+		$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('asteriskAccount_hideAstAccountRegistrationExten', false, _('Registration extension'), null, false));
 		$configContainerOptions->addNewLine();
 		$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('asteriskAccount_hideAstAccountCanCallForward', false, _('Can call forward'), null, false));
 		$configContainerOptions->addElement(new htmlOutputText(' '));
@@ -352,7 +352,7 @@ class asteriskAccount extends baseModule implements passwordService {
 			'AstAccountMusicOnHold' => _('Music on hold'),
 			'AstAccountExpirationTimestamp' => _('Expiration timestamp'),
 			'AstAccountRegistrationContext' => _('Registration context'),
-			'AstAccountRegistrationExten' => _('Registration extention'),
+			'AstAccountRegistrationExten' => _('Registration extension'),
 			'AstAccountCanCallForward' => _('Can call forward'),
 			'AstAccountIPAddress' => _('IP address'),
 			'AstAccountDefaultUser' => _('Default user'),
@@ -569,7 +569,7 @@ class asteriskAccount extends baseModule implements passwordService {
 		if (!$this->isBooleanConfigOptionSet('asteriskAccount_hideAstAccountRegistrationExten')) {
 			$return['upload_columns'][] = array(
 				'name' => 'asteriskAccount_AstAccountRegistrationExten',
-				'description' => _('Registration extention'),
+				'description' => _('Registration extension'),
 				'help' => 'AstAccountRegistrationExten',
 			);
 		}
@@ -914,7 +914,7 @@ class asteriskAccount extends baseModule implements passwordService {
 				if (isset($this->attributes['AstAccountRegistrationExten'][0])) {
 					$AstAccountRegistrationExten = $this->attributes['AstAccountRegistrationExten'][0];
 				}
-				$AstAccountRegistrationExtenInput = new htmlTableExtendedInputField(_("Registration extention"), 'AstAccountRegistrationExten', $AstAccountRegistrationExten, 'AstAccountRegistrationExten');
+				$AstAccountRegistrationExtenInput = new htmlTableExtendedInputField(_("Registration extension"), 'AstAccountRegistrationExten', $AstAccountRegistrationExten, 'AstAccountRegistrationExten');
 				$return->addElement($AstAccountRegistrationExtenInput, true);
 			}
 			// can call forward
diff --git a/lam/lib/modules/imapAccess.inc b/lam/lib/modules/imapAccess.inc
index f020baed..d63cf5c2 100644
--- a/lam/lib/modules/imapAccess.inc
+++ b/lam/lib/modules/imapAccess.inc
@@ -91,7 +91,7 @@ class imapAccess extends baseModule {
 				"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"),
-				"Text" => _("Please choose the attribute to get the IMAP user name. The default is mail but you can also use uid.")),
+				"Text" => _("Please choose the attribute to get the IMAP user name. The default is \"mail\" but you can also use \"uid\".")),
 			'MailAddress' => array(
 				"Headline" => _("Mailbox"),
 				"Text" => _("This mailbox will be created/deleted.")),
diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo
index 9e120f8a..282fcdae 100644
Binary files a/lam/locale/de_DE/LC_MESSAGES/messages.mo and b/lam/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.po b/lam/locale/de_DE/LC_MESSAGES/messages.po
index f02531b6..8f2fa404 100644
--- a/lam/locale/de_DE/LC_MESSAGES/messages.po
+++ b/lam/locale/de_DE/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2011-01-16 16:51+0100\n"
+"PO-Revision-Date: 2011-04-09 15:06+0200\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team: Deutsch <lam-i18n@lists.sourceforge.net>\n"
 "Language: \n"
@@ -33,7 +33,7 @@ msgstr "\"Senden als\"-Attribut"
 msgid "\"Send as\" privileges"
 msgstr "\"Senden als\"-Privilegien"
 
-#: ../lib/modules/posixAccount.inc:367
+#: ../lib/modules/posixAccount.inc:370
 msgid "$user and $group will be replaced with user name and primary group name."
 msgstr "$user und $group werden durch Benutzer- und Gruppenname ersetzt."
 
@@ -52,6 +52,11 @@ msgstr "%s NIS-Objekt(e) gefunden"
 msgid "%s alias(es) found"
 msgstr "%s Alias(e) gefunden"
 
+#: ../lib/types/automountType.inc:143
+#, php-format
+msgid "%s automount entry(ies) found"
+msgstr "%s Automount-Eintrag/Einträge gefunden"
+
 #: ../lib/types/smbDomain.inc:156
 #, php-format
 msgid "%s domain(s) found"
@@ -113,28 +118,28 @@ msgstr "(keine neuen Attribute verfügbar)"
 msgid "(no new binary attributes available for this entry)"
 msgstr "(keine neuen binären Attribute verfügbar)"
 
-#: ../lib/modules/posixAccount.inc:225
+#: ../lib/modules/posixAccount.inc:228
 msgid "/home/smiller"
 msgstr "/home/hmueller"
 
-#: ../lib/modules/inetOrgPerson.inc:324
+#: ../lib/modules/inetOrgPerson.inc:386
 #: ../lib/modules/asteriskVoicemail.inc:177
 msgid "123-123-1234"
 msgstr "01234 123456"
 
-#: ../lib/modules/inetOrgPerson.inc:340
+#: ../lib/modules/inetOrgPerson.inc:402
 msgid "123-123-1235"
 msgstr "01234 123457"
 
-#: ../lib/modules/inetOrgPerson.inc:348
+#: ../lib/modules/inetOrgPerson.inc:410
 msgid "123-123-1236"
 msgstr "01234 123458"
 
-#: ../lib/modules/inetOrgPerson.inc:332
+#: ../lib/modules/inetOrgPerson.inc:394
 msgid "123-124-1234"
 msgstr "01234 123459"
 
-#: ../lib/modules/inetOrgPerson.inc:316
+#: ../lib/modules/inetOrgPerson.inc:378
 msgid "12345"
 msgstr "12345"
 
@@ -198,6 +203,19 @@ msgstr ""
 "Benutzer können erlauben, dass andere in ihrem Namen handeln. Diese Option "
 "wird geprüft wenn über Kolab emails versendet werden."
 
+#: ../lib/modules/asteriskAccount.inc:122
+#: ../lib/modules/asteriskAccount.inc:251
+#: ../lib/modules/asteriskAccount.inc:333
+#: ../lib/modules/asteriskAccount.inc:411
+#: ../lib/modules/asteriskAccount.inc:707
+#: ../lib/modules/asteriskAccount.inc:1196
+msgid "AMA flags"
+msgstr "AMA-Flags"
+
+#: ../templates/lists/changePassword.php:564
+msgid "Aborted password change."
+msgstr "Passwortänderung wurde abgebrochen."
+
 #: ../lib/modules/sambaSamAccount.inc:543
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "Abu Dhabi, Muscat, Baku"
@@ -211,9 +229,15 @@ msgid "Account"
 msgstr "Account"
 
 #: ../templates/massBuildAccounts.php:170 ../lib/modules/ipHost.inc:109
-#: ../lib/modules/ipHost.inc:110 ../lib/modules/asteriskAccount.inc:169
-#: ../lib/modules/asteriskAccount.inc:172
-#: ../lib/modules/asteriskAccount.inc:175 ../lib/modules/account.inc:118
+#: ../lib/modules/ipHost.inc:110 ../lib/modules/asteriskAccount.inc:622
+#: ../lib/modules/asteriskAccount.inc:625
+#: ../lib/modules/asteriskAccount.inc:628
+#: ../lib/modules/asteriskAccount.inc:631
+#: ../lib/modules/asteriskAccount.inc:633
+#: ../lib/modules/asteriskAccount.inc:635
+#: ../lib/modules/asteriskAccount.inc:637
+#: ../lib/modules/asteriskAccount.inc:639
+#: ../lib/modules/asteriskAccount.inc:641 ../lib/modules/account.inc:118
 #: ../lib/modules/ieee802device.inc:89 ../lib/modules/posixGroup.inc:481
 #: ../lib/modules/posixGroup.inc:485 ../lib/modules/posixGroup.inc:486
 #: ../lib/modules/zarafaGroup.inc:138 ../lib/modules/zarafaGroup.inc:140
@@ -224,10 +248,10 @@ msgstr "Account"
 #: ../lib/modules/dhcp_settings.inc:281 ../lib/modules/dhcp_settings.inc:283
 #: ../lib/modules/dhcp_settings.inc:284 ../lib/modules/dhcp_settings.inc:286
 #: ../lib/modules/dhcp_settings.inc:288 ../lib/modules/dhcp_settings.inc:293
-#: ../lib/modules/dhcp_settings.inc:294 ../lib/modules/eduPerson.inc:214
-#: ../lib/modules/eduPerson.inc:216 ../lib/modules/eduPerson.inc:218
-#: ../lib/modules/eduPerson.inc:220 ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/dhcp_settings.inc:294 ../lib/modules/eduPerson.inc:216
+#: ../lib/modules/eduPerson.inc:218 ../lib/modules/eduPerson.inc:220
 #: ../lib/modules/eduPerson.inc:222 ../lib/modules/eduPerson.inc:223
+#: ../lib/modules/eduPerson.inc:224 ../lib/modules/eduPerson.inc:225
 #: ../lib/modules/quota.inc:51 ../lib/modules/quota.inc:53
 #: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:57
 #: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:61
@@ -244,13 +268,13 @@ msgstr "Account"
 #: ../lib/modules/sambaSamAccount.inc:107
 #: ../lib/modules/sambaSamAccount.inc:108
 #: ../lib/modules/sambaSamAccount.inc:110
-#: ../lib/modules/sambaSamAccount.inc:111 ../lib/modules/posixAccount.inc:70
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:79
-#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/sambaSamAccount.inc:111 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:81
 #: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/posixAccount.inc:91 ../lib/modules/posixAccount.inc:92
-#: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:97
+#: ../lib/modules/posixAccount.inc:98 ../lib/modules/posixAccount.inc:100
 #: ../lib/modules/zarafaUser.inc:348 ../lib/modules/zarafaUser.inc:350
 #: ../lib/modules/zarafaUser.inc:352 ../lib/modules/zarafaUser.inc:353
 #: ../lib/modules/zarafaUser.inc:355 ../lib/modules/zarafaUser.inc:357
@@ -268,23 +292,23 @@ msgstr "Account"
 #: ../lib/modules/shadowAccount.inc:58 ../lib/modules/shadowAccount.inc:60
 #: ../lib/modules/shadowAccount.inc:62 ../lib/modules/shadowAccount.inc:64
 #: ../lib/modules/shadowAccount.inc:66 ../lib/modules/shadowAccount.inc:67
-#: ../lib/modules/sambaDomain.inc:202 ../lib/modules/sambaDomain.inc:204
-#: ../lib/modules/sambaDomain.inc:206 ../lib/modules/sambaDomain.inc:208
-#: ../lib/modules/sambaDomain.inc:210 ../lib/modules/sambaDomain.inc:212
-#: ../lib/modules/inetOrgPerson.inc:48 ../lib/modules/inetOrgPerson.inc:50
-#: ../lib/modules/inetOrgPerson.inc:52 ../lib/modules/inetOrgPerson.inc:54
-#: ../lib/modules/inetOrgPerson.inc:56 ../lib/modules/inetOrgPerson.inc:58
-#: ../lib/modules/inetOrgPerson.inc:60 ../lib/modules/inetOrgPerson.inc:62
-#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:66
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/sudoRole.inc:224
-#: ../lib/modules/sudoRole.inc:226 ../lib/modules/sudoRole.inc:228
-#: ../lib/modules/sudoRole.inc:230 ../lib/modules/sudoRole.inc:232
-#: ../lib/modules/sudoRole.inc:234 ../lib/modules/zarafaServer.inc:121
-#: ../lib/modules/zarafaServer.inc:123 ../lib/modules/zarafaServer.inc:125
-#: ../lib/modules/zarafaServer.inc:126
+#: ../lib/modules/automount.inc:105 ../lib/modules/sambaDomain.inc:202
+#: ../lib/modules/sambaDomain.inc:204 ../lib/modules/sambaDomain.inc:206
+#: ../lib/modules/sambaDomain.inc:208 ../lib/modules/sambaDomain.inc:210
+#: ../lib/modules/sambaDomain.inc:212 ../lib/modules/inetOrgPerson.inc:48
+#: ../lib/modules/inetOrgPerson.inc:50 ../lib/modules/inetOrgPerson.inc:52
+#: ../lib/modules/inetOrgPerson.inc:54 ../lib/modules/inetOrgPerson.inc:56
+#: ../lib/modules/inetOrgPerson.inc:58 ../lib/modules/inetOrgPerson.inc:60
+#: ../lib/modules/inetOrgPerson.inc:62 ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/sudoRole.inc:224 ../lib/modules/sudoRole.inc:226
+#: ../lib/modules/sudoRole.inc:228 ../lib/modules/sudoRole.inc:230
+#: ../lib/modules/sudoRole.inc:232 ../lib/modules/sudoRole.inc:234
+#: ../lib/modules/zarafaServer.inc:121 ../lib/modules/zarafaServer.inc:123
+#: ../lib/modules/zarafaServer.inc:125 ../lib/modules/zarafaServer.inc:126
 #: ../lib/modules/asteriskVoicemail.inc:206
 #: ../lib/modules/asteriskVoicemail.inc:212
 #: ../lib/modules/asteriskVoicemail.inc:214
@@ -297,12 +321,12 @@ msgstr "Account"
 msgid "Account %s:"
 msgstr "Account %s:"
 
-#: ../lib/modules/asteriskAccount.inc:91
-#: ../lib/modules/asteriskAccount.inc:114
-#: ../lib/modules/asteriskAccount.inc:124
-#: ../lib/modules/asteriskAccount.inc:140
-#: ../lib/modules/asteriskAccount.inc:211
-#: ../lib/modules/asteriskAccount.inc:295
+#: ../lib/modules/asteriskAccount.inc:102
+#: ../lib/modules/asteriskAccount.inc:317
+#: ../lib/modules/asteriskAccount.inc:329
+#: ../lib/modules/asteriskAccount.inc:375
+#: ../lib/modules/asteriskAccount.inc:677
+#: ../lib/modules/asteriskAccount.inc:1188
 #: ../lib/modules/asteriskExtension.inc:82
 #: ../lib/modules/asteriskExtension.inc:112
 #: ../lib/modules/asteriskExtension.inc:124
@@ -322,7 +346,7 @@ msgstr "Accountkontext"
 msgid "Account creation via file upload"
 msgstr "Erstellung von Accounts mittels Dateiupload"
 
-#: ../lib/modules/posixAccount.inc:374
+#: ../lib/modules/posixAccount.inc:377
 msgid "Account deactivated"
 msgstr "Account deaktiviert"
 
@@ -332,18 +356,18 @@ msgstr "Accountdetails"
 
 #: ../lib/modules/sambaSamAccount.inc:323
 #: ../lib/modules/sambaSamAccount.inc:438
-#: ../lib/modules/sambaSamAccount.inc:1098
-#: ../lib/modules/sambaSamAccount.inc:1345
-#: ../lib/modules/sambaSamAccount.inc:1472
+#: ../lib/modules/sambaSamAccount.inc:1112
+#: ../lib/modules/sambaSamAccount.inc:1359
+#: ../lib/modules/sambaSamAccount.inc:1490
 #: ../lib/modules/phpGroupwareUser.inc:82
 #: ../lib/modules/phpGroupwareUser.inc:97
 #: ../lib/modules/phpGroupwareUser.inc:121
 #: ../lib/modules/phpGroupwareUser.inc:152
 #: ../lib/modules/phpGroupwareUser.inc:233
-#: ../lib/modules/phpGroupwareUser.inc:342
+#: ../lib/modules/phpGroupwareUser.inc:343
 #: ../lib/modules/shadowAccount.inc:121 ../lib/modules/shadowAccount.inc:184
-#: ../lib/modules/shadowAccount.inc:224 ../lib/modules/shadowAccount.inc:336
-#: ../lib/modules/shadowAccount.inc:404 ../lib/modules/shadowAccount.inc:455
+#: ../lib/modules/shadowAccount.inc:224 ../lib/modules/shadowAccount.inc:337
+#: ../lib/modules/shadowAccount.inc:412 ../lib/modules/shadowAccount.inc:467
 msgid "Account expiration date"
 msgstr "Ablaufdatum"
 
@@ -354,13 +378,13 @@ msgstr "Account ist deaktiviert"
 #: ../lib/modules/sambaSamAccount.inc:263
 #: ../lib/modules/sambaSamAccount.inc:269
 #: ../lib/modules/sambaSamAccount.inc:430
-#: ../lib/modules/sambaSamAccount.inc:1066
-#: ../lib/modules/sambaSamAccount.inc:1468
+#: ../lib/modules/sambaSamAccount.inc:1080
+#: ../lib/modules/sambaSamAccount.inc:1486
 msgid "Account is deactivated"
 msgstr "Account deaktiviert"
 
 #: ../lib/modules/sambaSamAccount.inc:266
-#: ../lib/modules/sambaSamAccount.inc:1072
+#: ../lib/modules/sambaSamAccount.inc:1086
 msgid "Account is locked"
 msgstr "Account gesperrt"
 
@@ -372,12 +396,17 @@ msgstr "Accountname:"
 #: ../lib/modules/phpGroupwareUser.inc:96
 #: ../lib/modules/phpGroupwareUser.inc:114
 #: ../lib/modules/phpGroupwareUser.inc:161
-#: ../lib/modules/phpGroupwareUser.inc:337
+#: ../lib/modules/phpGroupwareUser.inc:338
 msgid "Account status"
 msgstr "Accountstatus"
 
 #: ../templates/masscreate.php:130 ../templates/pdfedit/pdfdelete.php:85
-#: ../lib/modules/groupOfNames.inc:228
+#: ../lib/modules/asteriskAccount.inc:110
+#: ../lib/modules/asteriskAccount.inc:318
+#: ../lib/modules/asteriskAccount.inc:331
+#: ../lib/modules/asteriskAccount.inc:395
+#: ../lib/modules/asteriskAccount.inc:685
+#: ../lib/modules/asteriskAccount.inc:1190 ../lib/modules/groupOfNames.inc:248
 msgid "Account type"
 msgstr "Accounttyp"
 
@@ -406,7 +435,7 @@ msgstr ""
 msgid "Account was created successfully."
 msgstr "Account wurde erfolgreich erstellt."
 
-#: ../templates/lists/changePassword.php:555 ../lib/modules.inc:1535
+#: ../templates/lists/changePassword.php:587 ../lib/modules.inc:1535
 msgid "Account was modified successfully."
 msgstr "Account wurde erfolgreich geändert."
 
@@ -452,7 +481,7 @@ msgstr ""
 "Wenn Sie dieses Kästchen aktivieren, dann der Client-Drucker als "
 "Standarddrucker verwendet."
 
-#: ../lib/modules/posixAccount.inc:346
+#: ../lib/modules/posixAccount.inc:349
 msgid "Activating this checkbox will remove the user's home directory."
 msgstr ""
 "Wenn Sie dieses Kästchen aktivieren, dann wird das Heimatverzeichnis des "
@@ -479,16 +508,16 @@ msgstr "Aktive Accounttypen"
 #: ../templates/config/conftypes.php:214 ../templates/pdfedit/pdfpage.php:543
 #: ../templates/pdfedit/pdfpage.php:553 ../templates/pdfedit/pdfpage.php:563
 #: ../templates/pdfedit/pdfpage.php:577 ../lib/modules/zarafaUser.inc:728
-#: ../lib/modules/kolabUser.inc:867 ../lib/modules/kolabUser.inc:901
-#: ../lib/modules/nisnetgroup.inc:271 ../lib/modules/sudoRole.inc:269
+#: ../lib/modules/kolabUser.inc:868 ../lib/modules/kolabUser.inc:902
+#: ../lib/modules/nisnetgroup.inc:272 ../lib/modules/sudoRole.inc:269
 #: ../lib/modules/sudoRole.inc:296 ../lib/modules/sudoRole.inc:323
 #: ../lib/modules/sudoRole.inc:350 ../lib/modules/sudoRole.inc:377
-#: ../lib/modules/sudoRole.inc:404 ../lib/modules/groupOfNames.inc:169
-#: ../lib/modules/groupOfNames.inc:311
+#: ../lib/modules/sudoRole.inc:404 ../lib/modules/groupOfNames.inc:189
+#: ../lib/modules/groupOfNames.inc:331
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../lib/modules/asteriskAccount.inc:216
+#: ../lib/modules/asteriskAccount.inc:971
 msgid "Add Asterisk account"
 msgstr "Asterisk-Account hinzufügen"
 
@@ -496,7 +525,7 @@ msgstr "Asterisk-Account hinzufügen"
 msgid "Add Asterisk voicemail extension"
 msgstr "Asterisk Anrufbeantworter-Erweiterung hinzufügen"
 
-#: ../lib/modules/eduPerson.inc:384
+#: ../lib/modules/eduPerson.inc:398
 msgid "Add EDU person extension"
 msgstr "EDU-Person-Erweiterung hinzufügen"
 
@@ -508,12 +537,12 @@ msgstr "IP-Erweiterung hinzufügen"
 msgid "Add Kolab extension"
 msgstr "Kolab-Erweiterung hinzufügen"
 
-#: ../lib/modules/sambaSamAccount.inc:1209
+#: ../lib/modules/sambaSamAccount.inc:1223
 #: ../lib/modules/sambaGroupMapping.inc:293
 msgid "Add Samba 3 extension"
 msgstr "Samba 3-Erweiterung hinzufügen"
 
-#: ../lib/modules/shadowAccount.inc:364
+#: ../lib/modules/shadowAccount.inc:365
 msgid "Add Shadow account extension"
 msgstr "Shadow-Erweiterung hinzufügen"
 
@@ -522,7 +551,7 @@ msgstr "Shadow-Erweiterung hinzufügen"
 msgid "Add Zarafa extension"
 msgstr "Zarafa-Erweiterung hinzufügen"
 
-#: ../lib/modules/zarafaUser.inc:767 ../lib/modules/groupOfNames.inc:353
+#: ../lib/modules/zarafaUser.inc:767 ../lib/modules/groupOfNames.inc:374
 msgid "Add entries of this type:"
 msgstr "Einträge diesen Typs hinzufügen:"
 
@@ -530,11 +559,11 @@ msgstr "Einträge diesen Typs hinzufügen:"
 msgid "Add fix IP addresses to DNS"
 msgstr "Feste IP-Adressen zum DNS hinzufügen"
 
-#: ../lib/modules/hostObject.inc:161
+#: ../lib/modules/hostObject.inc:162
 msgid "Add host extension"
 msgstr "Host-Erweiterung hinzufügen"
 
-#: ../templates/selfService/adminMain.php:552 ../help/help.inc:178
+#: ../templates/selfService/adminMain.php:411 ../help/help.inc:178
 msgid "Add input field"
 msgstr "Feld hinzufügen"
 
@@ -549,12 +578,12 @@ msgstr "Neues Attribut hinzufügen"
 msgid "Add new binary attribute"
 msgstr "Neues Binärattribut hinzufügen"
 
-#: ../templates/selfService/adminMain.php:537 ../help/help.inc:176
+#: ../templates/selfService/adminMain.php:403 ../help/help.inc:176
 msgid "Add new group"
 msgstr "Gruppe hinzufügen"
 
-#: ../lib/modules/inetOrgPerson.inc:547 ../lib/modules/inetOrgPerson.inc:969
-#: ../lib/modules/inetOrgPerson.inc:1004 ../lib/modules/inetOrgPerson.inc:1586
+#: ../lib/modules/inetOrgPerson.inc:609 ../lib/modules/inetOrgPerson.inc:1038
+#: ../lib/modules/inetOrgPerson.inc:1073 ../lib/modules/inetOrgPerson.inc:1655
 msgid "Add photo"
 msgstr "Foto hinzufügen"
 
@@ -567,7 +596,7 @@ msgstr "Foto hinzufügen"
 msgid "Add phpGroupWare extension"
 msgstr "phpGroupWare-Erweiterung hinzufügen"
 
-#: ../templates/config/profmanage.php:206
+#: ../templates/config/profmanage.php:210
 #: ../templates/selfService/profManage.php:168 ../help/help.inc:116
 msgid "Add profile"
 msgstr "Neues Profil"
@@ -580,7 +609,7 @@ msgstr "Das Hinzufügen des Attributs ist fehlgeschlagen!"
 msgid "Adding the range failed because errors occured."
 msgstr "Hinzufügen des Adressbereiches schlug fehl."
 
-#: ../templates/selfService/adminMain.php:455 ../help/help.inc:182
+#: ../templates/selfService/adminMain.php:360 ../help/help.inc:182
 msgid "Additional CSS links"
 msgstr "Zusätzliche CSS-Links"
 
@@ -588,10 +617,10 @@ msgstr "Zusätzliche CSS-Links"
 msgid "Additional email addresses for this entry."
 msgstr "Zusätzliche EMail-Adressen für diesen Account."
 
-#: ../lib/modules/posixAccount.inc:217 ../lib/modules/posixAccount.inc:304
-#: ../lib/modules/posixAccount.inc:337 ../lib/modules/posixAccount.inc:382
-#: ../lib/modules/posixAccount.inc:961 ../lib/modules/posixAccount.inc:1041
-#: ../lib/modules/posixAccount.inc:1084 ../lib/modules/posixAccount.inc:1154
+#: ../lib/modules/posixAccount.inc:220 ../lib/modules/posixAccount.inc:307
+#: ../lib/modules/posixAccount.inc:340 ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/posixAccount.inc:972 ../lib/modules/posixAccount.inc:1052
+#: ../lib/modules/posixAccount.inc:1095 ../lib/modules/posixAccount.inc:1165
 msgid "Additional groups"
 msgstr "Zusätzliche Gruppen"
 
@@ -599,7 +628,7 @@ msgstr "Zusätzliche Gruppen"
 msgid "Additional tasks for module:"
 msgstr "Zusätzliche Aufgaben des Moduls:"
 
-#: ../lib/modules/imapAccess.inc:67
+#: ../lib/modules/imapAccess.inc:70
 msgid "Address of IMAP server (e.g. mail.example.org)."
 msgstr "Adresse des IMAP-Servers (z.B. mail.beispiel.de)."
 
@@ -625,18 +654,18 @@ msgstr "Fügt Eingabefelder für einen neuen IP-Bereich hinzu."
 msgid "Admin"
 msgstr "Administrator"
 
-#: ../lib/modules/inetOrgPerson.inc:284 ../lib/modules/inetOrgPerson.inc:372
+#: ../lib/modules/inetOrgPerson.inc:346 ../lib/modules/inetOrgPerson.inc:434
 msgid "Administration"
 msgstr "Verwaltung"
 
 #: ../lib/modules/posixGroup.inc:378 ../lib/modules/nisnetgroup.inc:112
-#: ../lib/modules/groupOfNames.inc:93
+#: ../lib/modules/groupOfNames.inc:97
 msgid "Administrators group"
 msgstr "Administratoren"
 
-#: ../lib/modules/eduPerson.inc:90 ../lib/modules/eduPerson.inc:94
-#: ../lib/modules/eduPerson.inc:158 ../lib/modules/eduPerson.inc:196
-#: ../lib/modules/eduPerson.inc:273 ../lib/modules/eduPerson.inc:663
+#: ../lib/modules/eduPerson.inc:92 ../lib/modules/eduPerson.inc:96
+#: ../lib/modules/eduPerson.inc:160 ../lib/modules/eduPerson.inc:198
+#: ../lib/modules/eduPerson.inc:287 ../lib/modules/eduPerson.inc:677
 msgid "Affiliations"
 msgstr "Zugehörigkeiten"
 
@@ -662,7 +691,7 @@ msgstr "Alias ist leer oder ungültig!"
 
 #: ../lib/types/mailAlias.inc:91 ../lib/modules/nisMailAlias.inc:67
 #: ../lib/modules/nisMailAlias.inc:82 ../lib/modules/nisMailAlias.inc:96
-#: ../lib/modules/nisMailAlias.inc:143 ../lib/modules/nisMailAlias.inc:283
+#: ../lib/modules/nisMailAlias.inc:144 ../lib/modules/nisMailAlias.inc:286
 msgid "Alias name"
 msgstr "Alias"
 
@@ -680,12 +709,12 @@ msgstr "Aliasziel"
 msgid "Aliases"
 msgstr "Aliase"
 
-#: ../lib/lists.inc:637
+#: ../lib/lists.inc:635
 #, php-format
 msgid "All accounts (%s)"
 msgstr "Alle Accounts (%s)"
 
-#: ../templates/selfService/selfServiceMain.php:274
+#: ../templates/selfService/selfServiceMain.php:321
 #: ../templates/initsuff.php:157
 msgid "All changes were successful."
 msgstr "Alle Änderungen waren erfolgreich."
@@ -694,7 +723,7 @@ msgstr "Alle Änderungen waren erfolgreich."
 msgid "All following lines form the mail body."
 msgstr "Alle folgenden Zeilen formen den Mailtext."
 
-#: ../lib/lists.inc:636
+#: ../lib/lists.inc:634
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "Alle selektierten Accounts (%s)"
@@ -712,18 +741,27 @@ msgstr "Passwortänderung erlauben"
 
 #: ../lib/modules/sambaSamAccount.inc:211
 #: ../lib/modules/sambaSamAccount.inc:329
-#: ../lib/modules/sambaSamAccount.inc:1384
-#: ../lib/modules/sambaSamAccount.inc:1664
+#: ../lib/modules/sambaSamAccount.inc:1402
+#: ../lib/modules/sambaSamAccount.inc:1682
 msgid "Allow terminal server login"
 msgstr "Terminalserver-Login erlauben"
 
+#: ../lib/modules/asteriskAccount.inc:194
+#: ../lib/modules/asteriskAccount.inc:287
+#: ../lib/modules/asteriskAccount.inc:351
+#: ../lib/modules/asteriskAccount.inc:543
+#: ../lib/modules/asteriskAccount.inc:881
+#: ../lib/modules/asteriskAccount.inc:1250
+msgid "Allowed codec"
+msgstr "Erlaubter Codec"
+
 #: ../templates/config/mainmanage.php:194 ../lib/types/user.inc:95
 #: ../help/help.inc:138
 msgid "Allowed hosts"
 msgstr "Erlaubte PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:1235
-#: ../lib/modules/sambaSamAccount.inc:1236
+#: ../lib/modules/sambaSamAccount.inc:1249
+#: ../lib/modules/sambaSamAccount.inc:1250
 msgid "Allowed workstations"
 msgstr "Erlaubte PCs"
 
@@ -750,8 +788,8 @@ msgstr ""
 "Es gibt bereits eine Sudo-Rolle mit diesem Namen. Bitte wählen Sie einen "
 "anderen."
 
-#: ../lib/modules/kolabUser.inc:330 ../lib/modules/kolabUser.inc:790
-#: ../lib/modules/kolabUser.inc:888
+#: ../lib/modules/kolabUser.inc:330 ../lib/modules/kolabUser.inc:791
+#: ../lib/modules/kolabUser.inc:889
 msgid "Anyone"
 msgstr "Jeder"
 
@@ -776,7 +814,7 @@ msgstr "Anwendungsdaten"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "Soll dieses Objekt gelöscht werden?"
 
-#: ../lib/modules/imapAccess.inc:105
+#: ../lib/modules/imapAccess.inc:114
 msgid "Ask"
 msgstr "Fragen"
 
@@ -784,6 +822,10 @@ msgstr "Fragen"
 msgid "Asterisk"
 msgstr "Asterisk"
 
+#: ../lib/modules/asteriskAccount.inc:123
+msgid "Asterisk AMA (Automated Message Accounting) flags."
+msgstr "Asterisk AMA (Automated Message Accounting) Flags."
+
 #: ../lib/modules/asteriskExtension.inc:63
 msgid "Asterisk extension"
 msgstr "Asterisk-Erweiterung"
@@ -796,9 +838,9 @@ msgstr "Asterisk-Erweiterungen"
 msgid "Asterisk extensions entries"
 msgstr "Asterisk-Erweiterungseinträge"
 
-#: ../lib/modules/asteriskAccount.inc:99
-#: ../lib/modules/asteriskAccount.inc:105
-#: ../lib/modules/asteriskAccount.inc:109
+#: ../lib/modules/asteriskAccount.inc:114
+#: ../lib/modules/asteriskAccount.inc:241
+#: ../lib/modules/asteriskAccount.inc:311
 msgid "Asterisk realm"
 msgstr "Asterisk -Bereich"
 
@@ -826,7 +868,7 @@ msgstr "Attributtypen"
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "Auckland, Fiji, Kamchatka"
 
-#: ../lib/modules/asteriskAccount.inc:100
+#: ../lib/modules/asteriskAccount.inc:115
 msgid ""
 "Authentication realm for Asterisk server (default: asterisk). This value set "
 "in sip.conf (option: \"realm\")."
@@ -834,7 +876,11 @@ msgstr ""
 "Authentifizierungsbereich für den Asterisk-Server (default asterisk). Dieser "
 "Wert wird in der sip.conf-Datei (Option: \"realm\") definiert."
 
-#: ../lib/modules/eduPerson.inc:127 ../lib/modules/eduPerson.inc:132
+#: ../lib/modules/asteriskAccount.inc:223
+msgid "Authentication user for outbound proxies."
+msgstr "Benutzer zur Authentifizierung bei ausgehenden Proxies."
+
+#: ../lib/modules/eduPerson.inc:129 ../lib/modules/eduPerson.inc:134
 #: ../lib/modules/sambaSamAccount.inc:147
 #: ../lib/modules/sambaSamAccount.inc:377 ../lib/modules/zarafaUser.inc:120
 #: ../lib/modules/zarafaUser.inc:1118 ../lib/modules/phpGroupwareUser.inc:86
@@ -844,6 +890,25 @@ msgstr ""
 msgid "Automatically add this extension"
 msgstr "Diese Erweiterung automatisch hinzufügen"
 
+#: ../lib/types/automountType.inc:39 ../lib/types/automountType.inc:48
+msgid "Automount entries"
+msgstr "Automount-Einträge"
+
+#: ../lib/types/automountType.inc:78 ../lib/modules/automount.inc:40
+#: ../lib/modules/automount.inc:58 ../lib/modules/automount.inc:78
+#: ../lib/modules/automount.inc:94 ../lib/modules/automount.inc:104
+#: ../lib/modules/automount.inc:124 ../lib/modules/automount.inc:191
+msgid "Automount entry"
+msgstr "Automount-Eintrag"
+
+#: ../lib/modules/automount.inc:104 ../lib/modules/automount.inc:105
+msgid ""
+"Automount entry contains invalid characters. Only ASCII characters are "
+"allowed."
+msgstr ""
+"Der Automount-Eintrag enthält ungültige Zeichen. Nur ASCII-Zeichen sind "
+"erlaubt."
+
 #: ../templates/config/conftypes.php:206 ../lib/modules/customScripts.inc:54
 msgid "Available account types"
 msgstr "Verfügbare Accounttypen"
@@ -852,7 +917,7 @@ msgstr "Verfügbare Accounttypen"
 msgid "Available actions"
 msgstr "Verfügbare Aktionen"
 
-#: ../lib/modules/posixAccount.inc:1044 ../lib/modules/nisnetgroup.inc:375
+#: ../lib/modules/posixAccount.inc:1055 ../lib/modules/nisnetgroup.inc:376
 msgid "Available groups"
 msgstr "Verfügbare Gruppen"
 
@@ -864,7 +929,7 @@ msgstr "Verfügbare Module"
 msgid "Available users"
 msgstr "Verfügbare Benutzer"
 
-#: ../lib/modules/sambaSamAccount.inc:1238
+#: ../lib/modules/sambaSamAccount.inc:1252
 msgid "Available workstations"
 msgstr "Verfügbare PCs"
 
@@ -878,10 +943,10 @@ msgstr "B-Knoten (0x01)"
 
 #: ../templates/tree/update_confirm.php:255
 #: ../templates/massBuildAccounts.php:227 ../lib/modules/posixGroup.inc:266
-#: ../lib/modules/sambaSamAccount.inc:1255
-#: ../lib/modules/posixAccount.inc:1062 ../lib/modules/zarafaUser.inc:774
-#: ../lib/modules/nisnetgroup.inc:389 ../lib/modules/inetOrgPerson.inc:1005
-#: ../lib/modules/groupOfNames.inc:360
+#: ../lib/modules/sambaSamAccount.inc:1269
+#: ../lib/modules/posixAccount.inc:1073 ../lib/modules/zarafaUser.inc:774
+#: ../lib/modules/nisnetgroup.inc:390 ../lib/modules/inetOrgPerson.inc:1074
+#: ../lib/modules/groupOfNames.inc:381
 msgid "Back"
 msgstr "Zurück"
 
@@ -901,6 +966,10 @@ msgstr "Zurück zur Accountliste"
 msgid "Back to alias list"
 msgstr "Zurück zur Aliasliste"
 
+#: ../lib/types/automountType.inc:30
+msgid "Back to automount list"
+msgstr "Zurück zur Automount-Liste"
+
 #: ../lib/types/smbDomain.inc:44
 msgid "Back to domain list"
 msgstr "Zurück zur Domänenliste"
@@ -1022,14 +1091,14 @@ msgid "Builtin group"
 msgstr "Vordefinierte Gruppe"
 
 #: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:124
-#: ../lib/modules/inetOrgPerson.inc:213 ../lib/modules/inetOrgPerson.inc:282
-#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:559
-#: ../lib/modules/inetOrgPerson.inc:935 ../lib/modules/inetOrgPerson.inc:1117
-#: ../lib/modules/inetOrgPerson.inc:1564
+#: ../lib/modules/inetOrgPerson.inc:275 ../lib/modules/inetOrgPerson.inc:344
+#: ../lib/modules/inetOrgPerson.inc:526 ../lib/modules/inetOrgPerson.inc:621
+#: ../lib/modules/inetOrgPerson.inc:1004 ../lib/modules/inetOrgPerson.inc:1186
+#: ../lib/modules/inetOrgPerson.inc:1633
 msgid "Business category"
 msgstr "Abteilung"
 
-#: ../lib/modules/inetOrgPerson.inc:560
+#: ../lib/modules/inetOrgPerson.inc:622
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "Abteilung (z.B. Verwaltung, IT-Service, Management, ...)"
 
@@ -1050,45 +1119,63 @@ msgstr "CSV-Datei"
 msgid "Cache timeout"
 msgstr "Cache Zeitbegrenzung"
 
-#: ../lib/modules/asteriskAccount.inc:83
-#: ../lib/modules/asteriskAccount.inc:123
-#: ../lib/modules/asteriskAccount.inc:133
-#: ../lib/modules/asteriskAccount.inc:195
-#: ../lib/modules/asteriskAccount.inc:294
+#: ../lib/modules/asteriskAccount.inc:126
+#: ../lib/modules/asteriskAccount.inc:253
+#: ../lib/modules/asteriskAccount.inc:334
+#: ../lib/modules/asteriskAccount.inc:419
+#: ../lib/modules/asteriskAccount.inc:716
+#: ../lib/modules/asteriskAccount.inc:1199
+msgid "Call groups"
+msgstr "Anrufergruppen"
+
+#: ../lib/modules/asteriskAccount.inc:94
+#: ../lib/modules/asteriskAccount.inc:328
+#: ../lib/modules/asteriskAccount.inc:368
+#: ../lib/modules/asteriskAccount.inc:661
+#: ../lib/modules/asteriskAccount.inc:1187
 msgid "Caller ID"
 msgstr "Anrufer-ID"
 
 #: ../lib/modules/sambaSamAccount.inc:284
 #: ../lib/modules/sambaSamAccount.inc:287
 #: ../lib/modules/sambaSamAccount.inc:290
-#: ../lib/modules/sambaSamAccount.inc:296 ../lib/modules/posixAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:296 ../lib/modules/posixAccount.inc:386
 #: ../lib/modules/sambaGroupMapping.inc:369
 #: ../lib/modules/shadowAccount.inc:169 ../lib/modules/shadowAccount.inc:173
 #: ../lib/modules/shadowAccount.inc:177 ../lib/modules/shadowAccount.inc:181
 msgid "Can be left empty."
 msgstr "Kann leer bleiben."
 
+#: ../lib/modules/asteriskAccount.inc:214
+#: ../lib/modules/asteriskAccount.inc:297
+#: ../lib/modules/asteriskAccount.inc:356
+#: ../lib/modules/asteriskAccount.inc:579
+#: ../lib/modules/asteriskAccount.inc:930
+#: ../lib/modules/asteriskAccount.inc:1265
+msgid "Can call forward"
+msgstr "Kann weiterleiten"
+
 #: ../templates/tree/update_confirm.php:241
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
 #: ../templates/ou_edit.php:118 ../templates/config/mainmanage.php:253
 #: ../templates/config/confmodules.php:218
-#: ../templates/config/confmain.php:375
+#: ../templates/config/confmain.php:373
 #: ../templates/config/moduleSettings.php:229
 #: ../templates/config/conftypes.php:280
-#: ../templates/selfService/adminMain.php:301
+#: ../templates/selfService/adminMain.php:479
 #: ../templates/pdfedit/pdfdelete.php:96 ../templates/pdfedit/pdfpage.php:585
 #: ../templates/delete.php:108 ../templates/profedit/profiledelete.php:92
 #: ../templates/profedit/profilepage.php:228 ../templates/initsuff.php:189
 #: ../lib/modules/device.inc:234 ../lib/modules/device.inc:259
-#: ../lib/modules/sambaSamAccount.inc:1330
-#: ../lib/modules/sambaSamAccount.inc:1366
-#: ../lib/modules/sambaSamAccount.inc:1446 ../lib/modules/zarafaUser.inc:729
+#: ../lib/modules/sambaSamAccount.inc:1344
+#: ../lib/modules/sambaSamAccount.inc:1384
+#: ../lib/modules/sambaSamAccount.inc:1464 ../lib/modules/zarafaUser.inc:729
 #: ../lib/modules/kolabUser.inc:563 ../lib/modules/phpGroupwareUser.inc:261
-#: ../lib/modules/shadowAccount.inc:416 ../lib/modules/nisnetgroup.inc:479
+#: ../lib/modules/shadowAccount.inc:428 ../lib/modules/nisnetgroup.inc:480
 #: ../lib/modules/aliasEntry.inc:142 ../lib/modules/aliasEntry.inc:162
-#: ../lib/modules/groupOfNames.inc:234 ../lib/modules/groupOfNames.inc:258
-#: ../lib/modules/groupOfNames.inc:312 ../lib/lists.inc:646
-#: ../lib/lists.inc:897 ../lib/modules.inc:1363
+#: ../lib/modules/groupOfNames.inc:254 ../lib/modules/groupOfNames.inc:278
+#: ../lib/modules/groupOfNames.inc:332 ../lib/lists.inc:644
+#: ../lib/lists.inc:716 ../lib/modules.inc:1363
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1100,10 +1187,14 @@ msgstr "Abbrechen"
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "Kann keine Verbindung zum LDAP-Server aufbauen. Bitte erneut versuchen."
 
-#: ../templates/login.php:247 ../lib/config.inc:1234
+#: ../templates/login.php:247 ../lib/config.inc:1236
 msgid "Cannot open config file!"
 msgstr "Kann Konfigurationsdatei nicht öffnen!"
 
+#: ../lib/modules/imapAccess.inc:161
+msgid "Cannot update quota."
+msgstr "Kann Quota nicht ändern."
+
 #: ../lib/modules/zarafaUser.inc:104 ../lib/modules/zarafaUser.inc:160
 #: ../lib/modules/zarafaUser.inc:236 ../lib/modules/zarafaUser.inc:329
 #: ../lib/modules/zarafaUser.inc:354 ../lib/modules/zarafaUser.inc:474
@@ -1111,14 +1202,14 @@ msgstr "Kann Konfigurationsdatei nicht öffnen!"
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: ../templates/selfService/adminMain.php:402
+#: ../templates/selfService/adminMain.php:361
 msgid "Captions and labels"
 msgstr "Überschriften und Beschriftungen"
 
-#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:209
-#: ../lib/modules/inetOrgPerson.inc:394 ../lib/modules/inetOrgPerson.inc:458
-#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:925
-#: ../lib/modules/inetOrgPerson.inc:1119 ../lib/modules/inetOrgPerson.inc:1550
+#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:271
+#: ../lib/modules/inetOrgPerson.inc:456 ../lib/modules/inetOrgPerson.inc:520
+#: ../lib/modules/inetOrgPerson.inc:633 ../lib/modules/inetOrgPerson.inc:994
+#: ../lib/modules/inetOrgPerson.inc:1188 ../lib/modules/inetOrgPerson.inc:1619
 msgid "Car license"
 msgstr "Führerschein"
 
@@ -1130,15 +1221,15 @@ msgstr "Mitteleuropäische Zeit, Paris, Berlin"
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "Central Time (USA & Kanada), Mexiko Stadt"
 
-#: ../templates/selfService/adminMain.php:480
+#: ../templates/selfService/adminMain.php:373
 #: ../templates/pdfedit/pdfpage.php:484 ../templates/pdfedit/pdfpage.php:493
-#: ../lib/modules/device.inc:178 ../lib/modules/sambaSamAccount.inc:1101
-#: ../lib/modules/sambaSamAccount.inc:1362 ../lib/modules/zarafaUser.inc:403
+#: ../lib/modules/device.inc:178 ../lib/modules/sambaSamAccount.inc:1115
+#: ../lib/modules/sambaSamAccount.inc:1380 ../lib/modules/zarafaUser.inc:403
 #: ../lib/modules/phpGroupwareUser.inc:154
 #: ../lib/modules/phpGroupwareUser.inc:256
-#: ../lib/modules/shadowAccount.inc:339 ../lib/modules/shadowAccount.inc:412
+#: ../lib/modules/shadowAccount.inc:340 ../lib/modules/shadowAccount.inc:424
 #: ../lib/modules/asteriskExtension.inc:256 ../lib/modules/aliasEntry.inc:94
-#: ../lib/modules/groupOfNames.inc:159 ../lib/modules/groupOfNames.inc:174
+#: ../lib/modules/groupOfNames.inc:179 ../lib/modules/groupOfNames.inc:194
 msgid "Change"
 msgstr "Ändern"
 
@@ -1146,11 +1237,11 @@ msgstr "Ändern"
 msgid "Change GID number of users and hosts"
 msgstr "Ändere die GID-Nummern aller Benutzer auf den neuen Wert"
 
-#: ../templates/config/profmanage.php:358 ../help/help.inc:124
+#: ../templates/config/profmanage.php:362 ../help/help.inc:124
 msgid "Change default profile"
 msgstr "Standardprofil wechseln"
 
-#: ../lib/lists.inc:888
+#: ../lib/lists.inc:716
 msgid "Change list settings"
 msgstr "Listeneinstellungen ändern"
 
@@ -1169,11 +1260,11 @@ msgstr "Passwort ändern"
 msgid "Change passwords"
 msgstr "Passwörter ändern"
 
-#: ../lib/types/dhcp.inc:281 ../lib/lists.inc:719
+#: ../lib/types/dhcp.inc:281 ../lib/lists.inc:717
 msgid "Change settings"
 msgstr "Einstellungen ändern"
 
-#: ../lib/modules/posixAccount.inc:828
+#: ../lib/modules/posixAccount.inc:846
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "Wert wurde geändert da nur ASCII-Zeichen erlaubt sind."
 
@@ -1201,7 +1292,7 @@ msgstr ""
 "Bitte prüfen Sie Ihre Eingaben sorgfältig. LAM wird nur einige grundlegende "
 "Prüfungen der Daten vornehmen."
 
-#: ../lib/modules/posixAccount.inc:99
+#: ../lib/modules/posixAccount.inc:101
 msgid "Choose a server for the home directory!"
 msgstr "Bitte wählen Sie einen Server für das Heimatverzeichnis!"
 
@@ -1209,7 +1300,7 @@ msgstr "Bitte wählen Sie einen Server für das Heimatverzeichnis!"
 msgid "Choose a template"
 msgstr "Wählen Sie eine Vorlage"
 
-#: ../lib/modules/imapAccess.inc:79
+#: ../lib/modules/imapAccess.inc:82
 msgid ""
 "Choose the way how to provide the IMAP admin password. You can use the same "
 "password as for the LAM login or LAM will ask you for a password when it is "
@@ -1229,8 +1320,8 @@ msgstr "Klicken, um zwischen Miniaturbild und Originalgröße umzuschalten."
 
 #: ../lib/modules/sambaSamAccount.inc:223
 #: ../lib/modules/sambaSamAccount.inc:356
-#: ../lib/modules/sambaSamAccount.inc:1414
-#: ../lib/modules/sambaSamAccount.inc:1692
+#: ../lib/modules/sambaSamAccount.inc:1432
+#: ../lib/modules/sambaSamAccount.inc:1710
 msgid "Client printer is default"
 msgstr "Client-Drucker ist Standarddrucker"
 
@@ -1265,13 +1356,14 @@ msgstr "Kommandos"
 msgid "Commit"
 msgstr "Bestätigen"
 
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:198
-#: ../lib/modules/posixAccount.inc:307 ../lib/modules/posixAccount.inc:386
-#: ../lib/modules/posixAccount.inc:408 ../lib/modules/posixAccount.inc:939
-#: ../lib/modules/posixAccount.inc:1149 ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:477 ../lib/modules/inetOrgPerson.inc:539
-#: ../lib/modules/inetOrgPerson.inc:834 ../lib/modules/inetOrgPerson.inc:1115
-#: ../lib/modules/inetOrgPerson.inc:1169
+#: ../lib/modules/posixAccount.inc:99 ../lib/modules/posixAccount.inc:145
+#: ../lib/modules/posixAccount.inc:201 ../lib/modules/posixAccount.inc:310
+#: ../lib/modules/posixAccount.inc:389 ../lib/modules/posixAccount.inc:411
+#: ../lib/modules/posixAccount.inc:950 ../lib/modules/posixAccount.inc:1160
+#: ../lib/modules/posixAccount.inc:1713 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:539 ../lib/modules/inetOrgPerson.inc:601
+#: ../lib/modules/inetOrgPerson.inc:903 ../lib/modules/inetOrgPerson.inc:1184
+#: ../lib/modules/inetOrgPerson.inc:1238
 #: ../lib/modules/asteriskExtension.inc:102
 #: ../lib/modules/asteriskExtension.inc:129
 #: ../lib/modules/asteriskExtension.inc:149
@@ -1298,21 +1390,21 @@ msgstr "Modulkonflikt:"
 
 #: ../lib/modules/sambaSamAccount.inc:221
 #: ../lib/modules/sambaSamAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:1410
-#: ../lib/modules/sambaSamAccount.inc:1682
+#: ../lib/modules/sambaSamAccount.inc:1428
+#: ../lib/modules/sambaSamAccount.inc:1700
 msgid "Connect client drives"
 msgstr "Verbinde Client-Laufwerke"
 
 #: ../lib/modules/sambaSamAccount.inc:222
 #: ../lib/modules/sambaSamAccount.inc:353
-#: ../lib/modules/sambaSamAccount.inc:1412
-#: ../lib/modules/sambaSamAccount.inc:1687
+#: ../lib/modules/sambaSamAccount.inc:1430
+#: ../lib/modules/sambaSamAccount.inc:1705
 msgid "Connect client printers"
 msgstr "Verbinde Client-Drucker"
 
 #: ../lib/modules/sambaSamAccount.inc:218
-#: ../lib/modules/sambaSamAccount.inc:1404
-#: ../lib/modules/sambaSamAccount.inc:1675
+#: ../lib/modules/sambaSamAccount.inc:1422
+#: ../lib/modules/sambaSamAccount.inc:1693
 msgid "Connection time limit"
 msgstr "Zeitlimit für Verbindung"
 
@@ -1329,7 +1421,7 @@ msgstr "Container-DN"
 msgid "Could not perform ldap_modify operation."
 msgstr "Konnte LDAP-Änderung nicht ausführen."
 
-#: ../templates/config/profmanage.php:137
+#: ../templates/config/profmanage.php:136
 #: ../templates/selfService/profManage.php:116
 msgid "Could not rename file!"
 msgstr "Konnte Datei nicht umbenennen!"
@@ -1340,7 +1432,7 @@ msgstr "Konnte PDF-Struktur nicht speichern, Zugriff verweigert."
 
 #: ../lib/modules/kolabUser.inc:86 ../lib/modules/kolabUser.inc:147
 #: ../lib/modules/kolabUser.inc:176 ../lib/modules/kolabUser.inc:215
-#: ../lib/modules/kolabUser.inc:285 ../lib/modules/kolabUser.inc:766
+#: ../lib/modules/kolabUser.inc:285 ../lib/modules/kolabUser.inc:767
 msgid "Country"
 msgstr "Land"
 
@@ -1360,7 +1452,7 @@ msgstr "Erstellen"
 msgid "Create Object"
 msgstr "Objekt erstellen"
 
-#: ../lib/lists.inc:435 ../lib/lists.inc:621 ../lib/modules.inc:1549
+#: ../lib/lists.inc:433 ../lib/lists.inc:619 ../lib/modules.inc:1549
 #: ../help/help.inc:156
 msgid "Create PDF file"
 msgstr "PDF-Datei erstellen"
@@ -1389,6 +1481,10 @@ msgstr "Weiteren Account anlegen"
 msgid "Create another alias"
 msgstr "Weiteren Alias anlegen"
 
+#: ../lib/types/automountType.inc:29
+msgid "Create another automount entry"
+msgstr "Weiteren Automount-Eintrag anlegen"
+
 #: ../lib/types/smbDomain.inc:43
 msgid "Create another domain"
 msgstr "Weitere Domäne anlegen"
@@ -1418,16 +1514,16 @@ msgstr "Weitere Sudo-Rolle anlegen"
 msgid "Create another user"
 msgstr "Weiteren Benutzer anlegen"
 
-#: ../lib/lists.inc:626
+#: ../lib/lists.inc:624
 msgid "Create for"
 msgstr "Erstellen für"
 
-#: ../lib/modules/posixAccount.inc:230 ../lib/modules/posixAccount.inc:977
-#: ../lib/modules/posixAccount.inc:1093
+#: ../lib/modules/posixAccount.inc:233 ../lib/modules/posixAccount.inc:988
+#: ../lib/modules/posixAccount.inc:1104
 msgid "Create home directory"
 msgstr "Heimatverzeichnis anlegen"
 
-#: ../lib/modules/imapAccess.inc:196
+#: ../lib/modules/imapAccess.inc:234
 msgid "Create mailbox"
 msgstr "Postfach erstellen"
 
@@ -1451,6 +1547,10 @@ msgstr "Erstellt Accounts durch das Hochladen einer CSV formatierten Datei."
 msgid "Current list of values for attribute:"
 msgstr "Aktuelle Werte für Attribut:"
 
+#: ../lib/modules/imapAccess.inc:287
+msgid "Current usage (kB)"
+msgstr "Aktueller Verbrauch (kB)"
+
 #: ../templates/tree/templates/templates.inc:51
 msgid "Custom"
 msgstr "Individuell"
@@ -1488,21 +1588,21 @@ msgstr "DHCP-Einstellungen"
 #: ../templates/tree/update_confirm.php:79
 #: ../templates/tree/add_attr_form.php:73 ../templates/tree/delete_form.php:77
 #: ../templates/tree/delete_form.php:151 ../templates/delete.php:87
-#: ../lib/modules.inc:382 ../lib/modules.inc:2059
+#: ../lib/modules.inc:382 ../lib/modules.inc:2077
 msgid "DN"
 msgstr "DN"
 
-#: ../templates/masscreate.php:274
+#: ../templates/masscreate.php:254
 msgid "DN settings"
 msgstr "DN-Einstellungen"
 
-#: ../templates/masscreate.php:281 ../help/help.inc:150
+#: ../templates/masscreate.php:283 ../help/help.inc:150
 msgid "DN suffix"
 msgstr "DN-Suffix"
 
 #: ../lib/modules/dhcp_settings.inc:175 ../lib/modules/dhcp_settings.inc:189
-#: ../lib/modules/dhcp_settings.inc:228 ../lib/modules/dhcp_settings.inc:526
-#: ../lib/modules/dhcp_settings.inc:613
+#: ../lib/modules/dhcp_settings.inc:228 ../lib/modules/dhcp_settings.inc:530
+#: ../lib/modules/dhcp_settings.inc:617
 msgid "DNS"
 msgstr "DNS"
 
@@ -1519,6 +1619,22 @@ msgstr "DNs der Besitzer dieser Erweiterung"
 msgid "DSML Export for: %s"
 msgstr "DSML-Export für: %s"
 
+#: ../lib/modules/asteriskAccount.inc:255
+#: ../lib/modules/asteriskAccount.inc:335
+#: ../lib/modules/asteriskAccount.inc:426
+#: ../lib/modules/asteriskAccount.inc:729
+msgid "DTFM flags"
+msgstr "DTFM-Flags"
+
+#: ../lib/modules/asteriskAccount.inc:130
+#: ../lib/modules/asteriskAccount.inc:1202
+msgid "DTMF mode"
+msgstr "DTFM-Modus"
+
+#: ../lib/modules/asteriskAccount.inc:131
+msgid "DTMF mode for SIP client configuration."
+msgstr "DTFM-Modus für SIP-Einstellung."
+
 #: ../templates/tree/templates/creation/custom.php:96
 msgid "Data field for RDN is empty!"
 msgstr "Datenfeld für RDN ist leer!"
@@ -1545,7 +1661,7 @@ msgstr "Debug"
 
 #: ../lib/modules/dhcp_settings.inc:139 ../lib/modules/dhcp_settings.inc:176
 #: ../lib/modules/dhcp_settings.inc:190 ../lib/modules/dhcp_settings.inc:234
-#: ../lib/modules/dhcp_settings.inc:528 ../lib/modules/dhcp_settings.inc:614
+#: ../lib/modules/dhcp_settings.inc:532 ../lib/modules/dhcp_settings.inc:618
 msgid "Default gateway"
 msgstr "Standard-Gateway"
 
@@ -1553,7 +1669,16 @@ msgstr "Standard-Gateway"
 msgid "Default language"
 msgstr "Standardsprache"
 
-#: ../templates/masscreate.php:266
+#: ../lib/modules/asteriskAccount.inc:222
+#: ../lib/modules/asteriskAccount.inc:301
+#: ../lib/modules/asteriskAccount.inc:358
+#: ../lib/modules/asteriskAccount.inc:594
+#: ../lib/modules/asteriskAccount.inc:948
+#: ../lib/modules/asteriskAccount.inc:1271
+msgid "Default user"
+msgstr "Standardbenutzer"
+
+#: ../templates/masscreate.php:272 ../templates/masscreate.php:347
 msgid "Default value"
 msgstr "Standardwert"
 
@@ -1561,10 +1686,16 @@ msgstr "Standardwert"
 msgid "Defines if workstations may change their passwords."
 msgstr "Hier können Sie bestimmen, ob Computer ihre Domänenpasswörter ändern dürfen."
 
+#: ../lib/modules/asteriskAccount.inc:151
+msgid ""
+"Defines the mailbox to check for message waiting indication (MWI) for this "
+"peer."
+msgstr "Gibt das Postfach für Message Waiting Indication (MWI) dieses Teilnehmers an."
+
 #: ../lib/modules/kolabUser.inc:117 ../lib/modules/kolabUser.inc:131
 #: ../lib/modules/kolabUser.inc:135 ../lib/modules/kolabUser.inc:195
 #: ../lib/modules/kolabUser.inc:218 ../lib/modules/kolabUser.inc:370
-#: ../lib/modules/kolabUser.inc:804 ../lib/modules/kolabUser.inc:868
+#: ../lib/modules/kolabUser.inc:805 ../lib/modules/kolabUser.inc:869
 msgid "Delegates"
 msgstr "Vollmachten"
 
@@ -1572,8 +1703,8 @@ msgstr "Vollmachten"
 #: ../templates/ou_edit.php:117 ../templates/pdfedit/pdfdelete.php:95
 #: ../templates/pdfedit/pdfmain.php:161 ../templates/delete.php:107
 #: ../templates/profedit/profilemain.php:160 ../lib/tree.inc:1176
-#: ../lib/modules/kolabUser.inc:864 ../lib/modules/nisnetgroup.inc:242
-#: ../lib/lists.inc:429
+#: ../lib/modules/kolabUser.inc:865 ../lib/modules/nisnetgroup.inc:243
+#: ../lib/lists.inc:427
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1599,6 +1730,10 @@ msgstr "Alias(e) löschen"
 msgid "Delete all %s objects"
 msgstr "Alle %s-Objekte löschen"
 
+#: ../lib/types/automountType.inc:146
+msgid "Delete automount entry(ies)"
+msgstr "Automount-Eintrag/Einträge löschen"
+
 #: ../lib/types/smbDomain.inc:159
 msgid "Delete domain(s)"
 msgstr "Lösche Domäne(n)"
@@ -1612,7 +1747,7 @@ msgstr "Lösche Erweiterung(en)"
 msgid "Delete group(s)"
 msgstr "Lösche Gruppe(n)"
 
-#: ../lib/modules/posixAccount.inc:1016
+#: ../lib/modules/posixAccount.inc:1027
 msgid "Delete home directory"
 msgstr "Heimatverzeichnis löschen"
 
@@ -1620,7 +1755,7 @@ msgstr "Heimatverzeichnis löschen"
 msgid "Delete host(s)"
 msgstr "Host(s) löschen"
 
-#: ../lib/modules/imapAccess.inc:189
+#: ../lib/modules/imapAccess.inc:227
 msgid "Delete mailbox"
 msgstr "Postfach löschen"
 
@@ -1632,7 +1767,7 @@ msgstr "Objekt löschen"
 msgid "Delete organizational unit"
 msgstr "Organizational Unit löschen"
 
-#: ../lib/modules/inetOrgPerson.inc:972
+#: ../lib/modules/inetOrgPerson.inc:1041
 msgid "Delete photo"
 msgstr "Foto löschen"
 
@@ -1640,7 +1775,7 @@ msgstr "Foto löschen"
 msgid "Delete policy(ies)"
 msgstr "Richtlinie(n) löschen"
 
-#: ../templates/config/profmanage.php:286
+#: ../templates/config/profmanage.php:290
 #: ../templates/selfService/profManage.php:262 ../help/help.inc:120
 msgid "Delete profile"
 msgstr "Lösche Profil"
@@ -1685,47 +1820,58 @@ msgstr "Löscht einen IP-Adressbereich."
 msgid "Deleting %s"
 msgstr "Lösche %s"
 
-#: ../lib/lists.inc:937
+#: ../lib/lists.inc:924
 msgid "Deletion was successful."
 msgstr "Löschen war erfolgreich."
 
-#: ../lib/modules/inetOrgPerson.inc:125 ../lib/modules/inetOrgPerson.inc:132
-#: ../lib/modules/inetOrgPerson.inc:215 ../lib/modules/inetOrgPerson.inc:370
-#: ../lib/modules/inetOrgPerson.inc:467 ../lib/modules/inetOrgPerson.inc:579
-#: ../lib/modules/inetOrgPerson.inc:940 ../lib/modules/inetOrgPerson.inc:1125
-#: ../lib/modules/inetOrgPerson.inc:1596
+#: ../lib/modules/asteriskAccount.inc:158
+#: ../lib/modules/asteriskAccount.inc:269
+#: ../lib/modules/asteriskAccount.inc:342
+#: ../lib/modules/asteriskAccount.inc:478
+#: ../lib/modules/asteriskAccount.inc:800
+#: ../lib/modules/asteriskAccount.inc:1223
+msgid "Deny"
+msgstr "Verbieten"
+
+#: ../lib/modules/inetOrgPerson.inc:125 ../lib/modules/inetOrgPerson.inc:156
+#: ../lib/modules/inetOrgPerson.inc:277 ../lib/modules/inetOrgPerson.inc:432
+#: ../lib/modules/inetOrgPerson.inc:529 ../lib/modules/inetOrgPerson.inc:641
+#: ../lib/modules/inetOrgPerson.inc:1009 ../lib/modules/inetOrgPerson.inc:1194
+#: ../lib/modules/inetOrgPerson.inc:1665
 msgid "Department(s)"
 msgstr "Unternehmensbereich(e)"
 
 #: ../templates/tree/add_value_form.php:186 ../templates/schema/schema.php:87
 #: ../templates/schema/schema.php:141 ../templates/schema/schema.php:344
-#: ../lib/types/nisObjectType.inc:80 ../lib/types/user.inc:101
-#: ../lib/types/sudo.inc:84 ../lib/types/dhcp.inc:96
+#: ../lib/types/automountType.inc:79 ../lib/types/nisObjectType.inc:80
+#: ../lib/types/user.inc:101 ../lib/types/sudo.inc:84 ../lib/types/dhcp.inc:96
 #: ../lib/types/netgroup.inc:92 ../lib/modules/account.inc:75
 #: ../lib/modules/account.inc:88 ../lib/modules/account.inc:98
-#: ../lib/modules/account.inc:106 ../lib/modules/account.inc:220
-#: ../lib/modules/account.inc:231 ../lib/modules/posixGroup.inc:185
+#: ../lib/modules/account.inc:106 ../lib/modules/account.inc:221
+#: ../lib/modules/account.inc:232 ../lib/modules/posixGroup.inc:185
 #: ../lib/modules/posixGroup.inc:337 ../lib/modules/posixGroup.inc:389
 #: ../lib/modules/posixGroup.inc:456 ../lib/modules/device.inc:70
 #: ../lib/modules/device.inc:103 ../lib/modules/device.inc:113
-#: ../lib/modules/device.inc:159 ../lib/modules/device.inc:394
+#: ../lib/modules/device.inc:159 ../lib/modules/device.inc:395
 #: ../lib/modules/dhcp_settings.inc:166 ../lib/modules/dhcp_settings.inc:181
-#: ../lib/modules/dhcp_settings.inc:261 ../lib/modules/dhcp_settings.inc:560
-#: ../lib/modules/dhcp_settings.inc:619 ../lib/modules/posixAccount.inc:404
+#: ../lib/modules/dhcp_settings.inc:261 ../lib/modules/dhcp_settings.inc:564
+#: ../lib/modules/dhcp_settings.inc:623 ../lib/modules/posixAccount.inc:407
 #: ../lib/modules/nisObject.inc:66 ../lib/modules/nisObject.inc:96
 #: ../lib/modules/nisObject.inc:107 ../lib/modules/nisObject.inc:148
 #: ../lib/modules/nisObject.inc:213 ../lib/modules/sambaGroupMapping.inc:325
-#: ../lib/modules/sambaGroupMapping.inc:394 ../lib/modules/nisnetgroup.inc:77
-#: ../lib/modules/nisnetgroup.inc:130 ../lib/modules/nisnetgroup.inc:188
-#: ../lib/modules/nisnetgroup.inc:573 ../lib/modules/inetOrgPerson.inc:179
-#: ../lib/modules/inetOrgPerson.inc:250 ../lib/modules/inetOrgPerson.inc:413
-#: ../lib/modules/inetOrgPerson.inc:483 ../lib/modules/inetOrgPerson.inc:841
-#: ../lib/modules/inetOrgPerson.inc:1100 ../lib/modules/sudoRole.inc:59
-#: ../lib/modules/sudoRole.inc:128 ../lib/modules/sudoRole.inc:172
-#: ../lib/modules/sudoRole.inc:253 ../lib/modules/sudoRole.inc:684
-#: ../lib/modules/groupOfNames.inc:64 ../lib/modules/groupOfNames.inc:91
-#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:150
-#: ../lib/modules/groupOfNames.inc:451
+#: ../lib/modules/sambaGroupMapping.inc:394 ../lib/modules/automount.inc:62
+#: ../lib/modules/automount.inc:85 ../lib/modules/automount.inc:95
+#: ../lib/modules/automount.inc:130 ../lib/modules/automount.inc:192
+#: ../lib/modules/nisnetgroup.inc:77 ../lib/modules/nisnetgroup.inc:130
+#: ../lib/modules/nisnetgroup.inc:189 ../lib/modules/nisnetgroup.inc:574
+#: ../lib/modules/inetOrgPerson.inc:241 ../lib/modules/inetOrgPerson.inc:312
+#: ../lib/modules/inetOrgPerson.inc:475 ../lib/modules/inetOrgPerson.inc:545
+#: ../lib/modules/inetOrgPerson.inc:910 ../lib/modules/inetOrgPerson.inc:1169
+#: ../lib/modules/sudoRole.inc:59 ../lib/modules/sudoRole.inc:128
+#: ../lib/modules/sudoRole.inc:172 ../lib/modules/sudoRole.inc:253
+#: ../lib/modules/sudoRole.inc:684 ../lib/modules/groupOfNames.inc:64
+#: ../lib/modules/groupOfNames.inc:95 ../lib/modules/groupOfNames.inc:126
+#: ../lib/modules/groupOfNames.inc:170 ../lib/modules/groupOfNames.inc:479
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1746,14 +1892,23 @@ msgstr "Client-Änderungen deaktivieren"
 msgid "Disables the client to update DNS entries."
 msgstr "Deaktiviert die Möglichkeit, dass Clients DNS-Einträge verändern dürfen."
 
+#: ../lib/modules/asteriskAccount.inc:190
+#: ../lib/modules/asteriskAccount.inc:285
+#: ../lib/modules/asteriskAccount.inc:350
+#: ../lib/modules/asteriskAccount.inc:536
+#: ../lib/modules/asteriskAccount.inc:872
+#: ../lib/modules/asteriskAccount.inc:1247
+msgid "Disallowed codec"
+msgstr "Unerlaubter Codec"
+
 #: ../lib/modules/sambaDomain.inc:106 ../lib/modules/sambaDomain.inc:186
 #: ../lib/modules/sambaDomain.inc:292 ../lib/modules/sambaDomain.inc:649
 msgid "Disconnect users outside logon hours"
 msgstr "Abmeldung außerhalb der Anmeldezeiten"
 
 #: ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:1406
-#: ../lib/modules/sambaSamAccount.inc:1676
+#: ../lib/modules/sambaSamAccount.inc:1424
+#: ../lib/modules/sambaSamAccount.inc:1694
 msgid "Disconnection time limit"
 msgstr "Zeitlimit für Trennung"
 
@@ -1765,8 +1920,8 @@ msgstr "Meldet Benutzer ab, die außerhalb der definierten Anmeldezeiten aktiv s
 #: ../lib/modules/sambaSamAccount.inc:191
 #: ../lib/modules/sambaSamAccount.inc:236
 #: ../lib/modules/sambaSamAccount.inc:394
-#: ../lib/modules/sambaSamAccount.inc:1057
-#: ../lib/modules/sambaSamAccount.inc:1633
+#: ../lib/modules/sambaSamAccount.inc:1071
+#: ../lib/modules/sambaSamAccount.inc:1651
 #: ../lib/modules/sambaGroupMapping.inc:263
 #: ../lib/modules/sambaGroupMapping.inc:323
 #: ../lib/modules/sambaGroupMapping.inc:356
@@ -1814,15 +1969,15 @@ msgstr "Wollen Sie die Änderungen übernehmen?"
 #: ../lib/modules/sambaSamAccount.inc:314
 #: ../lib/modules/sambaSamAccount.inc:387
 #: ../lib/modules/sambaSamAccount.inc:511
-#: ../lib/modules/sambaSamAccount.inc:1178
-#: ../lib/modules/sambaSamAccount.inc:1507
-#: ../lib/modules/sambaSamAccount.inc:1529
-#: ../lib/modules/sambaSamAccount.inc:1651
+#: ../lib/modules/sambaSamAccount.inc:1192
+#: ../lib/modules/sambaSamAccount.inc:1525
+#: ../lib/modules/sambaSamAccount.inc:1547
+#: ../lib/modules/sambaSamAccount.inc:1669
 #: ../lib/modules/sambaGroupMapping.inc:71
 #: ../lib/modules/sambaGroupMapping.inc:290
 #: ../lib/modules/sambaGroupMapping.inc:368
-#: ../lib/modules/sambaGroupMapping.inc:414 ../lib/modules/nisnetgroup.inc:212
-#: ../lib/modules/nisnetgroup.inc:583
+#: ../lib/modules/sambaGroupMapping.inc:414 ../lib/modules/nisnetgroup.inc:213
+#: ../lib/modules/nisnetgroup.inc:584
 msgid "Domain"
 msgstr "Domäne"
 
@@ -1849,7 +2004,7 @@ msgid "Domain certificate admins"
 msgstr "Domänen-Zertifikats-Administratoren"
 
 #: ../lib/modules/sambaSamAccount.inc:75
-#: ../lib/modules/sambaSamAccount.inc:772
+#: ../lib/modules/sambaSamAccount.inc:779
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain computers"
 msgstr "Domänen-PCs"
@@ -1876,8 +2031,8 @@ msgstr "Domänengäste"
 
 #: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:124
 #: ../lib/modules/dhcp_settings.inc:172 ../lib/modules/dhcp_settings.inc:186
-#: ../lib/modules/dhcp_settings.inc:210 ../lib/modules/dhcp_settings.inc:520
-#: ../lib/modules/dhcp_settings.inc:610 ../lib/modules/nisnetgroup.inc:144
+#: ../lib/modules/dhcp_settings.inc:210 ../lib/modules/dhcp_settings.inc:524
+#: ../lib/modules/dhcp_settings.inc:614 ../lib/modules/nisnetgroup.inc:144
 #: ../lib/modules/sambaDomain.inc:70 ../lib/modules/sambaDomain.inc:137
 #: ../lib/modules/sambaDomain.inc:177 ../lib/modules/sambaDomain.inc:234
 #: ../lib/modules/sambaDomain.inc:239 ../lib/modules/sambaDomain.inc:618
@@ -1900,7 +2055,7 @@ msgid "Domain schema admins"
 msgstr "Domänen-Schema-Administratoren"
 
 #: ../lib/modules/sambaSamAccount.inc:74
-#: ../lib/modules/sambaSamAccount.inc:1957
+#: ../lib/modules/sambaSamAccount.inc:1975
 #: ../lib/modules/sambaGroupMapping.inc:59
 msgid "Domain users"
 msgstr "Domänenbenutzer"
@@ -1935,8 +2090,8 @@ msgstr "Eastern Time (USA & Kanada), Bogota"
 
 #: ../templates/pdfedit/pdfmain.php:158
 #: ../templates/profedit/profilemain.php:157
-#: ../lib/modules/sambaSamAccount.inc:1183
-#: ../lib/modules/sambaSamAccount.inc:1188 ../lib/lists.inc:423
+#: ../lib/modules/sambaSamAccount.inc:1197
+#: ../lib/modules/sambaSamAccount.inc:1202 ../lib/lists.inc:421
 msgid "Edit"
 msgstr "Editieren"
 
@@ -1944,7 +2099,7 @@ msgstr "Editieren"
 msgid "Edit general settings"
 msgstr "Allgemeine Einstellungen ändern"
 
-#: ../lib/modules/posixAccount.inc:962
+#: ../lib/modules/posixAccount.inc:973
 msgid "Edit groups"
 msgstr "Gruppen ändern"
 
@@ -1960,11 +2115,11 @@ msgstr "SelfService bearbeiten"
 msgid "Edit server profiles"
 msgstr "Serverprofile ändern"
 
-#: ../lib/modules/nisnetgroup.inc:197
+#: ../lib/modules/nisnetgroup.inc:198
 msgid "Edit subgroups"
 msgstr "Untergruppen ändern"
 
-#: ../lib/modules/sambaSamAccount.inc:1139
+#: ../lib/modules/sambaSamAccount.inc:1153
 msgid "Edit workstations"
 msgstr "Arbeitsstationen ändern"
 
@@ -1977,16 +2132,16 @@ msgstr "EMail"
 #: ../lib/modules/zarafaGroup.inc:60 ../lib/modules/zarafaGroup.inc:87
 #: ../lib/modules/zarafaGroup.inc:124 ../lib/modules/zarafaGroup.inc:137
 #: ../lib/modules/zarafaGroup.inc:413 ../lib/modules/inetOrgPerson.inc:59
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:205
-#: ../lib/modules/inetOrgPerson.inc:354 ../lib/modules/inetOrgPerson.inc:452
-#: ../lib/modules/inetOrgPerson.inc:535 ../lib/modules/inetOrgPerson.inc:536
-#: ../lib/modules/inetOrgPerson.inc:912 ../lib/modules/inetOrgPerson.inc:1114
-#: ../lib/modules/inetOrgPerson.inc:1466
+#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:153
+#: ../lib/modules/inetOrgPerson.inc:267 ../lib/modules/inetOrgPerson.inc:416
+#: ../lib/modules/inetOrgPerson.inc:514 ../lib/modules/inetOrgPerson.inc:597
+#: ../lib/modules/inetOrgPerson.inc:598 ../lib/modules/inetOrgPerson.inc:981
+#: ../lib/modules/inetOrgPerson.inc:1183 ../lib/modules/inetOrgPerson.inc:1535
 #: ../lib/modules/asteriskVoicemail.inc:98
 #: ../lib/modules/asteriskVoicemail.inc:131
 #: ../lib/modules/asteriskVoicemail.inc:169
 #: ../lib/modules/asteriskVoicemail.inc:261
-#: ../lib/modules/asteriskVoicemail.inc:410 ../lib/modules/imapAccess.inc:165
+#: ../lib/modules/asteriskVoicemail.inc:410 ../lib/modules/imapAccess.inc:203
 msgid "Email address"
 msgstr "EMail-Adresse"
 
@@ -2021,18 +2176,18 @@ msgstr "EMail-Aliasliste hat ungültiges Format!"
 #: ../lib/modules/zarafaGroup.inc:170 ../lib/modules/zarafaGroup.inc:418
 #: ../lib/modules/zarafaUser.inc:380 ../lib/modules/kolabUser.inc:189
 #: ../lib/modules/kolabUser.inc:217 ../lib/modules/kolabUser.inc:350
-#: ../lib/modules/kolabUser.inc:800
+#: ../lib/modules/kolabUser.inc:801
 msgid "Email aliases"
 msgstr "EMail-Aliase"
 
-#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:141
-#: ../lib/modules/inetOrgPerson.inc:211 ../lib/modules/inetOrgPerson.inc:266
-#: ../lib/modules/inetOrgPerson.inc:461 ../lib/modules/inetOrgPerson.inc:499
-#: ../lib/modules/inetOrgPerson.inc:930 ../lib/modules/inetOrgPerson.inc:1104
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:273 ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:523 ../lib/modules/inetOrgPerson.inc:561
+#: ../lib/modules/inetOrgPerson.inc:999 ../lib/modules/inetOrgPerson.inc:1173
 msgid "Employee type"
 msgstr "Angestelltentyp"
 
-#: ../lib/modules/inetOrgPerson.inc:500
+#: ../lib/modules/inetOrgPerson.inc:562
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "Angestelltentyp: Angestellter, Extern, Aushilfskraft, ..."
 
@@ -2056,11 +2211,11 @@ msgstr ""
 msgid "Encountered an error while performing search."
 msgstr "Die LDAP-Suche ist fehlgeschlagen."
 
-#: ../lib/modules/imapAccess.inc:69 ../lib/modules/imapAccess.inc:98
+#: ../lib/modules/imapAccess.inc:72 ../lib/modules/imapAccess.inc:107
 msgid "Encryption protocol"
 msgstr "Verschlüsselung"
 
-#: ../lib/modules/imapAccess.inc:70
+#: ../lib/modules/imapAccess.inc:73
 msgid ""
 "Encryption protocol for connecting to IMAP server. LAM requires an encrypted "
 "connection."
@@ -2076,9 +2231,9 @@ msgstr "Eniwetok, Kwajalein"
 msgid "Enter the value you would like to add:"
 msgstr "Geben Sie den neuen Wert ein:"
 
-#: ../lib/modules/eduPerson.inc:103 ../lib/modules/eduPerson.inc:107
-#: ../lib/modules/eduPerson.inc:171 ../lib/modules/eduPerson.inc:202
-#: ../lib/modules/eduPerson.inc:321 ../lib/modules/eduPerson.inc:667
+#: ../lib/modules/eduPerson.inc:105 ../lib/modules/eduPerson.inc:109
+#: ../lib/modules/eduPerson.inc:173 ../lib/modules/eduPerson.inc:204
+#: ../lib/modules/eduPerson.inc:335 ../lib/modules/eduPerson.inc:681
 msgid "Entitlements"
 msgstr "Berechtigungen"
 
@@ -2122,13 +2277,13 @@ msgstr ""
 "strukturelle Objektklasse bereit."
 
 #: ../lib/modules/customScripts.inc:60 ../lib/modules/customScripts.inc:72
-#: ../lib/modules/dhcp_settings.inc:517 ../lib/modules/zarafaUser.inc:130
+#: ../lib/modules/dhcp_settings.inc:521 ../lib/modules/zarafaUser.inc:130
 #: ../help/help.inc:70 ../help/help.inc:76 ../help/help.inc:82
 #: ../help/help.inc:87 ../help/help.inc:107
 msgid "Example"
 msgstr "Beispiel"
 
-#: ../templates/masscreate.php:262
+#: ../templates/masscreate.php:268 ../templates/masscreate.php:343
 msgid "Example value"
 msgstr "Beispielwert"
 
@@ -2144,6 +2299,19 @@ msgstr "Ausführen"
 msgid "Execute lamdaemon"
 msgstr "Lamdaemon ausführen"
 
+#: ../lib/modules/asteriskAccount.inc:202
+#: ../lib/modules/asteriskAccount.inc:291
+#: ../lib/modules/asteriskAccount.inc:353
+#: ../lib/modules/asteriskAccount.inc:558
+#: ../lib/modules/asteriskAccount.inc:899
+#: ../lib/modules/asteriskAccount.inc:1256
+msgid "Expiration timestamp"
+msgstr "Ablaufzeit"
+
+#: ../lib/modules/asteriskAccount.inc:203
+msgid "Expiration timestamp (\"regseconds\" option)."
+msgstr "Ablaufzeit (\"regseconds\" Option)."
+
 #: ../lib/types/ppolicyType.inc:86 ../lib/modules/ppolicy.inc:108
 #: ../lib/modules/ppolicy.inc:140 ../lib/modules/ppolicy.inc:166
 #: ../lib/modules/ppolicy.inc:202 ../lib/modules/ppolicy.inc:463
@@ -2197,10 +2365,11 @@ msgid "Failure count interval"
 msgstr "Fehlerzählerintervall"
 
 #: ../lib/modules/inetOrgPerson.inc:57 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:346
-#: ../lib/modules/inetOrgPerson.inc:449 ../lib/modules/inetOrgPerson.inc:531
-#: ../lib/modules/inetOrgPerson.inc:532 ../lib/modules/inetOrgPerson.inc:907
-#: ../lib/modules/inetOrgPerson.inc:1113 ../lib/modules/inetOrgPerson.inc:1494
+#: ../lib/modules/inetOrgPerson.inc:150 ../lib/modules/inetOrgPerson.inc:265
+#: ../lib/modules/inetOrgPerson.inc:408 ../lib/modules/inetOrgPerson.inc:511
+#: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:594
+#: ../lib/modules/inetOrgPerson.inc:976 ../lib/modules/inetOrgPerson.inc:1182
+#: ../lib/modules/inetOrgPerson.inc:1563
 msgid "Fax number"
 msgstr "Faxnummer"
 
@@ -2224,7 +2393,7 @@ msgid "File path"
 msgstr "Dateipfad"
 
 #: ../templates/masscreate.php:229 ../lib/tools/fileUpload.inc:44
-#: ../lib/types/dhcp.inc:245 ../lib/lists.inc:689
+#: ../lib/types/dhcp.inc:245 ../lib/lists.inc:687
 msgid "File upload"
 msgstr "Dateiupload"
 
@@ -2233,16 +2402,16 @@ msgid "File upload failed!"
 msgstr "Dateiupload ist fehlgeschlagen!"
 
 #: ../lib/modules/zarafaUser.inc:124 ../lib/modules/nisnetgroup.inc:94
-#: ../lib/modules/nisnetgroup.inc:466 ../lib/lists.inc:348
+#: ../lib/modules/nisnetgroup.inc:467 ../lib/lists.inc:346
 #: ../help/help.inc:142
 msgid "Filter"
 msgstr "Filtern"
 
 #: ../lib/types/user.inc:96 ../lib/modules/inetOrgPerson.inc:47
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:235
-#: ../lib/modules/inetOrgPerson.inc:409 ../lib/modules/inetOrgPerson.inc:491
-#: ../lib/modules/inetOrgPerson.inc:825 ../lib/modules/inetOrgPerson.inc:1102
-#: ../lib/modules/inetOrgPerson.inc:1452
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:297
+#: ../lib/modules/inetOrgPerson.inc:471 ../lib/modules/inetOrgPerson.inc:553
+#: ../lib/modules/inetOrgPerson.inc:894 ../lib/modules/inetOrgPerson.inc:1171
+#: ../lib/modules/inetOrgPerson.inc:1521
 msgid "First name"
 msgstr "Vorname"
 
@@ -2250,7 +2419,7 @@ msgstr "Vorname"
 msgid "First name contains invalid characters!"
 msgstr "Vorname enthält ungültige Zeichen!"
 
-#: ../lib/modules/inetOrgPerson.inc:492
+#: ../lib/modules/inetOrgPerson.inc:554
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "Vorname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
 
@@ -2274,7 +2443,7 @@ msgstr ""
 "Für den Upload geben Sie bitte die Einträge im Format \"(HOST,BENUTZER,"
 "DOMAIN)\" ein. Mehrere Einträge werden durch Strichpunkt getrennt."
 
-#: ../lib/modules/shadowAccount.inc:353
+#: ../lib/modules/shadowAccount.inc:354
 msgid "Force password change"
 msgstr "Passwortänderung erzwingen"
 
@@ -2285,7 +2454,7 @@ msgstr "Format"
 #: ../lib/modules/kolabUser.inc:87 ../lib/modules/kolabUser.inc:116
 #: ../lib/modules/kolabUser.inc:155 ../lib/modules/kolabUser.inc:201
 #: ../lib/modules/kolabUser.inc:219 ../lib/modules/kolabUser.inc:312
-#: ../lib/modules/kolabUser.inc:778 ../lib/modules/kolabUser.inc:830
+#: ../lib/modules/kolabUser.inc:779 ../lib/modules/kolabUser.inc:831
 msgid "Free/Busy interval"
 msgstr "Frei/Besetzt-Intervall"
 
@@ -2293,7 +2462,7 @@ msgstr "Frei/Besetzt-Intervall"
 msgid "Free/Busy interval must be a number!"
 msgstr "Frei/Besetzt-Intervall muss eine Nummer sein!"
 
-#: ../lib/modules/sambaSamAccount.inc:1274
+#: ../lib/modules/sambaSamAccount.inc:1288
 msgid "Friday"
 msgstr "Freitag"
 
@@ -2301,10 +2470,45 @@ msgstr "Freitag"
 msgid "From address"
 msgstr "Absenderadresse"
 
-#: ../templates/config/confmain.php:415
+#: ../templates/config/confmain.php:413
 msgid "From address for password mails is invalid."
 msgstr "Absenderadresse für Passwortmails ist ungültig."
 
+#: ../lib/modules/asteriskAccount.inc:138
+#: ../lib/modules/asteriskAccount.inc:259
+#: ../lib/modules/asteriskAccount.inc:337
+#: ../lib/modules/asteriskAccount.inc:441
+#: ../lib/modules/asteriskAccount.inc:747
+#: ../lib/modules/asteriskAccount.inc:1208
+msgid "From domain"
+msgstr "Quelldomäne"
+
+#: ../lib/modules/asteriskAccount.inc:139
+msgid "From domain setting for this account."
+msgstr "Quelldomäne für diesen Account."
+
+#: ../lib/modules/asteriskAccount.inc:134
+#: ../lib/modules/asteriskAccount.inc:257
+#: ../lib/modules/asteriskAccount.inc:336
+#: ../lib/modules/asteriskAccount.inc:434
+#: ../lib/modules/asteriskAccount.inc:738
+#: ../lib/modules/asteriskAccount.inc:1205
+msgid "From user"
+msgstr "Quellbenutzer"
+
+#: ../lib/modules/asteriskAccount.inc:135
+msgid "From user setting for this account."
+msgstr "Quellbenutzer für diesen Account."
+
+#: ../lib/modules/asteriskAccount.inc:142
+#: ../lib/modules/asteriskAccount.inc:261
+#: ../lib/modules/asteriskAccount.inc:338
+#: ../lib/modules/asteriskAccount.inc:448
+#: ../lib/modules/asteriskAccount.inc:756
+#: ../lib/modules/asteriskAccount.inc:1211
+msgid "Full contact"
+msgstr "Vollständiger Kontakt"
+
 #: ../templates/lists/changePassword.php:232
 #: ../lib/modules/asteriskVoicemail.inc:94
 #: ../lib/modules/asteriskVoicemail.inc:130
@@ -2318,7 +2522,7 @@ msgstr "Vollständiger Name"
 msgid "Full name for Asterisk voicemail mailbox."
 msgstr "Vollständiger Name für den Anrufbeantworter."
 
-#: ../lib/modules/inetOrgPerson.inc:300
+#: ../lib/modules/inetOrgPerson.inc:362
 msgid "GB-12345"
 msgstr "DE-12345"
 
@@ -2326,8 +2530,8 @@ msgstr "DE-12345"
 #: ../lib/modules/posixGroup.inc:176 ../lib/modules/posixGroup.inc:330
 #: ../lib/modules/posixGroup.inc:343 ../lib/modules/posixGroup.inc:385
 #: ../lib/modules/posixGroup.inc:405 ../lib/modules/posixGroup.inc:454
-#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixAccount.inc:93
-#: ../lib/modules/posixAccount.inc:301 ../lib/modules/posixAccount.inc:1151
+#: ../lib/modules/posixGroup.inc:474 ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:304 ../lib/modules/posixAccount.inc:1162
 #: ../lib/modules/sambaGroupMapping.inc:321
 #: ../lib/modules/sambaGroupMapping.inc:390
 msgid "GID number"
@@ -2341,7 +2545,7 @@ msgstr ""
 "Die GID-Nummer wurde geändert. Bitte verwenden sie das Kontrollkästchen um "
 "die GID-Nummer von Benutzern und Hosts anzupassen."
 
-#: ../lib/modules/posixAccount.inc:93
+#: ../lib/modules/posixAccount.inc:95
 #, php-format
 msgid ""
 "GID number has changed. To keep file ownership you have to run the following "
@@ -2355,10 +2559,10 @@ msgstr ""
 msgid "GID number has to be a numeric value!"
 msgstr "GID-Nummer muss eine Zahl sein!"
 
-#: ../lib/modules/posixAccount.inc:259 ../lib/modules/posixAccount.inc:291
-#: ../lib/modules/posixAccount.inc:302 ../lib/modules/posixAccount.inc:358
-#: ../lib/modules/posixAccount.inc:396 ../lib/modules/posixAccount.inc:950
-#: ../lib/modules/posixAccount.inc:1152
+#: ../lib/modules/posixAccount.inc:262 ../lib/modules/posixAccount.inc:294
+#: ../lib/modules/posixAccount.inc:305 ../lib/modules/posixAccount.inc:361
+#: ../lib/modules/posixAccount.inc:399 ../lib/modules/posixAccount.inc:961
+#: ../lib/modules/posixAccount.inc:1163
 msgid "Gecos"
 msgstr "Gecos"
 
@@ -2408,7 +2612,7 @@ msgid "Grace inode period"
 msgstr "Inode-Frist"
 
 #: ../templates/config/confmain.php:295
-#: ../templates/selfService/adminMain.php:578
+#: ../templates/selfService/adminMain.php:441
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2443,10 +2647,10 @@ msgstr "Gruppenmitglieder"
 #: ../lib/modules/posixGroup.inc:482 ../lib/modules/posixGroup.inc:483
 #: ../lib/modules/posixGroup.inc:484 ../lib/modules/nisnetgroup.inc:73
 #: ../lib/modules/nisnetgroup.inc:102 ../lib/modules/nisnetgroup.inc:129
-#: ../lib/modules/nisnetgroup.inc:141 ../lib/modules/nisnetgroup.inc:182
-#: ../lib/modules/nisnetgroup.inc:571 ../lib/modules/groupOfNames.inc:60
-#: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:111
-#: ../lib/modules/groupOfNames.inc:447
+#: ../lib/modules/nisnetgroup.inc:141 ../lib/modules/nisnetgroup.inc:183
+#: ../lib/modules/nisnetgroup.inc:572 ../lib/modules/groupOfNames.inc:60
+#: ../lib/modules/groupOfNames.inc:88 ../lib/modules/groupOfNames.inc:125
+#: ../lib/modules/groupOfNames.inc:475
 msgid "Group name"
 msgstr "Gruppenname"
 
@@ -2540,7 +2744,7 @@ msgstr "Hawaii"
 msgid "Headline"
 msgstr "Überschrift"
 
-#: ../lib/modules.inc:952
+#: ../templates/main_header.php:109 ../lib/modules.inc:952
 msgid "Help"
 msgstr "Hilfe"
 
@@ -2578,7 +2782,7 @@ msgstr ""
 "Hier können Sie einen Filtertext eingeben. Es werden dann nur Einträge "
 "angezeigt, die diesen Wert enthalten."
 
-#: ../lib/modules/posixAccount.inc:338
+#: ../lib/modules/posixAccount.inc:341
 msgid ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
@@ -2590,7 +2794,7 @@ msgstr ""
 msgid "Here you can enter a serial number for this device."
 msgstr "Hier können Sie eine Seriennummer für das Gerät eintragen."
 
-#: ../lib/modules/inetOrgPerson.inc:580
+#: ../lib/modules/inetOrgPerson.inc:642
 msgid ""
 "Here you can enter the user's department(s). Multiple entries are separated "
 "by semicolons."
@@ -2717,10 +2921,12 @@ msgstr "Hier können Sie prüfen, ob bestimmte LAM-Funktionen korrekt funktionie
 msgid "Hidden"
 msgstr "Versteckt"
 
+#: ../lib/modules/asteriskAccount.inc:234
+#: ../lib/modules/asteriskAccount.inc:245
 #: ../lib/modules/sambaSamAccount.inc:374
-#: ../lib/modules/sambaSamAccount.inc:562 ../lib/modules/zarafaUser.inc:116
-#: ../lib/modules/zarafaUser.inc:142 ../lib/modules/inetOrgPerson.inc:175
-#: ../lib/modules/inetOrgPerson.inc:583
+#: ../lib/modules/sambaSamAccount.inc:564 ../lib/modules/zarafaUser.inc:116
+#: ../lib/modules/zarafaUser.inc:142 ../lib/modules/inetOrgPerson.inc:237
+#: ../lib/modules/inetOrgPerson.inc:645
 msgid "Hidden options"
 msgstr "Versteckte Optionen"
 
@@ -2747,25 +2953,25 @@ msgstr ""
 "Tipp: Um ein Attribut zu löschen, leeren Sie das Eingabefeld und speichern "
 "die Änderung."
 
-#: ../lib/modules/posixAccount.inc:383
+#: ../lib/modules/posixAccount.inc:386
 msgid "Hold the CTRL-key to (de)select multiple groups."
 msgstr "Halten Sie Strg gedrückt um mehrere Gruppen zu markieren."
 
 #: ../lib/types/user.inc:98 ../lib/modules/sambaSamAccount.inc:212
 #: ../lib/modules/sambaSamAccount.inc:332
-#: ../lib/modules/sambaSamAccount.inc:1386
-#: ../lib/modules/sambaSamAccount.inc:1665 ../lib/modules/posixAccount.inc:68
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:71
-#: ../lib/modules/posixAccount.inc:99 ../lib/modules/posixAccount.inc:223
-#: ../lib/modules/posixAccount.inc:305 ../lib/modules/posixAccount.inc:341
-#: ../lib/modules/posixAccount.inc:345 ../lib/modules/posixAccount.inc:349
-#: ../lib/modules/posixAccount.inc:366 ../lib/modules/posixAccount.inc:756
-#: ../lib/modules/posixAccount.inc:965 ../lib/modules/posixAccount.inc:1088
-#: ../lib/modules/posixAccount.inc:1155
+#: ../lib/modules/sambaSamAccount.inc:1404
+#: ../lib/modules/sambaSamAccount.inc:1683 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:226
+#: ../lib/modules/posixAccount.inc:308 ../lib/modules/posixAccount.inc:344
+#: ../lib/modules/posixAccount.inc:348 ../lib/modules/posixAccount.inc:352
+#: ../lib/modules/posixAccount.inc:369 ../lib/modules/posixAccount.inc:774
+#: ../lib/modules/posixAccount.inc:976 ../lib/modules/posixAccount.inc:1099
+#: ../lib/modules/posixAccount.inc:1166
 msgid "Home directory"
 msgstr "Heimatverzeichnis"
 
-#: ../lib/modules/posixAccount.inc:71
+#: ../lib/modules/posixAccount.inc:73
 #, php-format
 msgid ""
 "Home directory changed. To keep home directory you have to run the following "
@@ -2774,7 +2980,7 @@ msgstr ""
 "Heimatverzeichnis wurde geändert. Sie müssen folgendes Kommando als root-"
 "Benutzer ausführen um das alte Verzeichnis zu ändern: 'mv %s %s'"
 
-#: ../lib/modules/posixAccount.inc:1100
+#: ../lib/modules/posixAccount.inc:1111
 msgid "Home directory server"
 msgstr "Heimatverzeichnis-Server"
 
@@ -2782,12 +2988,12 @@ msgstr "Heimatverzeichnis-Server"
 #: ../lib/modules/sambaSamAccount.inc:213
 #: ../lib/modules/sambaSamAccount.inc:280
 #: ../lib/modules/sambaSamAccount.inc:461
-#: ../lib/modules/sambaSamAccount.inc:566
-#: ../lib/modules/sambaSamAccount.inc:1112
-#: ../lib/modules/sambaSamAccount.inc:1394
-#: ../lib/modules/sambaSamAccount.inc:1483
-#: ../lib/modules/sambaSamAccount.inc:1639
-#: ../lib/modules/sambaSamAccount.inc:1666
+#: ../lib/modules/sambaSamAccount.inc:569
+#: ../lib/modules/sambaSamAccount.inc:1126
+#: ../lib/modules/sambaSamAccount.inc:1412
+#: ../lib/modules/sambaSamAccount.inc:1501
+#: ../lib/modules/sambaSamAccount.inc:1657
+#: ../lib/modules/sambaSamAccount.inc:1684
 msgid "Home drive"
 msgstr "Heimatlaufwerk"
 
@@ -2795,10 +3001,10 @@ msgstr "Heimatlaufwerk"
 #: ../lib/modules/sambaSamAccount.inc:199
 #: ../lib/modules/sambaSamAccount.inc:283
 #: ../lib/modules/sambaSamAccount.inc:469
-#: ../lib/modules/sambaSamAccount.inc:567
-#: ../lib/modules/sambaSamAccount.inc:1120
-#: ../lib/modules/sambaSamAccount.inc:1487
-#: ../lib/modules/sambaSamAccount.inc:1636
+#: ../lib/modules/sambaSamAccount.inc:571
+#: ../lib/modules/sambaSamAccount.inc:1134
+#: ../lib/modules/sambaSamAccount.inc:1505
+#: ../lib/modules/sambaSamAccount.inc:1654
 msgid "Home path"
 msgstr "Heimatverzeichnis"
 
@@ -2811,24 +3017,24 @@ msgid "Home server for the user."
 msgstr "Dies ist der Heimatserver des Benutzers."
 
 #: ../lib/modules/inetOrgPerson.inc:53 ../lib/modules/inetOrgPerson.inc:123
-#: ../lib/modules/inetOrgPerson.inc:199 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:443 ../lib/modules/inetOrgPerson.inc:551
-#: ../lib/modules/inetOrgPerson.inc:897 ../lib/modules/inetOrgPerson.inc:1111
-#: ../lib/modules/inetOrgPerson.inc:1480
+#: ../lib/modules/inetOrgPerson.inc:261 ../lib/modules/inetOrgPerson.inc:392
+#: ../lib/modules/inetOrgPerson.inc:505 ../lib/modules/inetOrgPerson.inc:613
+#: ../lib/modules/inetOrgPerson.inc:966 ../lib/modules/inetOrgPerson.inc:1180
+#: ../lib/modules/inetOrgPerson.inc:1549
 msgid "Home telephone number"
 msgstr "Telefon privat"
 
-#: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:70
+#: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:72
 msgid "Homedirectory contains invalid characters."
 msgstr "Heimatverzeichnis enthält ungültige Zeichen."
 
-#: ../lib/modules/asteriskAccount.inc:87
-#: ../lib/modules/asteriskAccount.inc:113
-#: ../lib/modules/asteriskAccount.inc:125
-#: ../lib/modules/asteriskAccount.inc:147
-#: ../lib/modules/asteriskAccount.inc:203
-#: ../lib/modules/asteriskAccount.inc:296 ../lib/modules/nisnetgroup.inc:206
-#: ../lib/modules/nisnetgroup.inc:581 ../lib/modules/hostObject.inc:142
+#: ../lib/modules/asteriskAccount.inc:98
+#: ../lib/modules/asteriskAccount.inc:316
+#: ../lib/modules/asteriskAccount.inc:330
+#: ../lib/modules/asteriskAccount.inc:382
+#: ../lib/modules/asteriskAccount.inc:669
+#: ../lib/modules/asteriskAccount.inc:1189 ../lib/modules/nisnetgroup.inc:207
+#: ../lib/modules/nisnetgroup.inc:582 ../lib/modules/hostObject.inc:143
 msgid "Host"
 msgstr "Host"
 
@@ -2840,30 +3046,30 @@ msgstr "Hostaccounts (z.B. Samba)"
 msgid "Host description"
 msgstr "Hostbeschreibung"
 
-#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:397
-#: ../lib/modules/posixAccount.inc:405
+#: ../lib/modules/account.inc:89 ../lib/modules/posixAccount.inc:400
+#: ../lib/modules/posixAccount.inc:408
 msgid "Host description. If left empty host name will be used."
 msgstr "Hostbeschreibung. Falls leer wird der Hostname verwendet."
 
 #: ../lib/modules/hostObject.inc:84 ../lib/modules/hostObject.inc:91
-#: ../lib/modules/hostObject.inc:255
+#: ../lib/modules/hostObject.inc:256
 msgid "Host list"
 msgstr "Hostliste"
 
 #: ../lib/types/host.inc:91 ../lib/types/host.inc:92
-#: ../lib/modules/account.inc:84 ../lib/modules/account.inc:208
-#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
-#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:270
-#: ../lib/modules/posixAccount.inc:392 ../lib/modules/nisnetgroup.inc:143
-#: ../lib/modules/nisnetgroup.inc:470
+#: ../lib/modules/account.inc:84 ../lib/modules/account.inc:209
+#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:88 ../lib/modules/posixAccount.inc:273
+#: ../lib/modules/posixAccount.inc:395 ../lib/modules/nisnetgroup.inc:143
+#: ../lib/modules/nisnetgroup.inc:471
 msgid "Host name"
 msgstr "Hostname"
 
-#: ../lib/modules/posixAccount.inc:90
+#: ../lib/modules/posixAccount.inc:92
 msgid "Host name already exists!"
 msgstr "Host-Name besteht schon!"
 
-#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:88
+#: ../lib/modules/posixAccount.inc:86 ../lib/modules/posixAccount.inc:90
 #: ../lib/modules/nisnetgroup.inc:143
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
@@ -2872,15 +3078,15 @@ msgstr ""
 "Hostname enthält ungültige Zeichen. Gültige Zeichen sind: a-z, A-Z, 0-9 "
 "und .-_!"
 
-#: ../lib/modules/posixAccount.inc:86
+#: ../lib/modules/posixAccount.inc:88
 msgid "Host name in use. Selected next free host name."
 msgstr "Hostname wird bereits verwendet. Nächster freier Hostname wurde ausgewählt."
 
-#: ../lib/modules/sambaSamAccount.inc:1026
+#: ../lib/modules/sambaSamAccount.inc:1040
 msgid "Host name must end with $!"
 msgstr "Der Hostname muss mit einem $ enden!"
 
-#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:393
+#: ../lib/modules/account.inc:85 ../lib/modules/posixAccount.inc:396
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,A-"
 "Z,0-9, .-_$. Host names are always ending with $. If last character is not $ "
@@ -2895,9 +3101,9 @@ msgstr ""
 msgid "Host(s)"
 msgstr "Host(s)"
 
-#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:169 ../lib/modules/sudoRole.inc:67
+#: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:172 ../lib/modules/sudoRole.inc:67
 #: ../lib/modules/sudoRole.inc:92 ../lib/modules/sudoRole.inc:140
 #: ../lib/modules/sudoRole.inc:174 ../lib/modules/sudoRole.inc:183
 #: ../lib/modules/sudoRole.inc:291 ../lib/modules/sudoRole.inc:690
@@ -2910,31 +3116,36 @@ msgstr "Hosts"
 msgid "I am sure"
 msgstr "Ich bin sicher"
 
-#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:738
+#: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:756
 msgid "ID is already in use"
 msgstr "ID wird bereits verwendet"
 
 #: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixGroup.inc:476
 #: ../lib/modules/posixGroup.inc:477 ../lib/modules/posixGroup.inc:575
-#: ../lib/modules/posixAccount.inc:72 ../lib/modules/posixAccount.inc:73
-#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:736
-#: ../lib/modules/posixAccount.inc:738
+#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:754
+#: ../lib/modules/posixAccount.inc:756
 msgid "ID-Number"
 msgstr "ID-Nummer"
 
-#: ../lib/modules/imapAccess.inc:75 ../lib/modules/imapAccess.inc:102
+#: ../lib/modules/imapAccess.inc:78 ../lib/modules/imapAccess.inc:111
 msgid "IMAP admin user"
 msgstr "IMAP Administrator"
 
-#: ../lib/modules/imapAccess.inc:78 ../lib/modules/imapAccess.inc:105
+#: ../lib/modules/imapAccess.inc:81 ../lib/modules/imapAccess.inc:114
 msgid "IMAP password input"
 msgstr "IMAP-Passworteingabe"
 
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ipHost.inc:48
 #: ../lib/modules/ipHost.inc:58 ../lib/modules/ipHost.inc:127
-#: ../lib/modules/fixed_ip.inc:93 ../lib/modules/fixed_ip.inc:338
-#: ../lib/modules/fixed_ip.inc:513
+#: ../lib/modules/asteriskAccount.inc:218
+#: ../lib/modules/asteriskAccount.inc:299
+#: ../lib/modules/asteriskAccount.inc:357
+#: ../lib/modules/asteriskAccount.inc:586
+#: ../lib/modules/asteriskAccount.inc:939
+#: ../lib/modules/asteriskAccount.inc:1268 ../lib/modules/fixed_ip.inc:93
+#: ../lib/modules/fixed_ip.inc:338 ../lib/modules/fixed_ip.inc:516
 msgid "IP address"
 msgstr "IP-Adresse"
 
@@ -2944,6 +3155,14 @@ msgstr "IP-Adresse"
 msgid "IP address of the DNS server"
 msgstr "IP-Adresse des DNS-Servers"
 
+#: ../lib/modules/asteriskAccount.inc:219
+msgid "IP address of the peer. Valid only for realtime peers."
+msgstr "IP-Adresse des Teilnehmers. Dies wird nur für Echtzeitteilnehmer benötigt."
+
+#: ../lib/modules/asteriskAccount.inc:227
+msgid "IP address or domain name of the registration server."
+msgstr "IP-Adresse oder Domäne des Registrierungsservers."
+
 #: ../lib/modules/ipHost.inc:62 ../lib/modules/ipHost.inc:77
 #: ../lib/modules/ipHost.inc:97 ../lib/modules/ipHost.inc:309
 msgid "IP address(es)"
@@ -2953,13 +3172,13 @@ msgstr "IP-Adresse(n)"
 msgid "IP list"
 msgstr "IP-Liste"
 
-#: ../templates/masscreate.php:258
+#: ../templates/masscreate.php:264 ../templates/masscreate.php:339
 msgid "Identifier"
 msgstr "Bezeichner"
 
 #: ../lib/modules/sambaSamAccount.inc:220
-#: ../lib/modules/sambaSamAccount.inc:1408
-#: ../lib/modules/sambaSamAccount.inc:1677
+#: ../lib/modules/sambaSamAccount.inc:1426
+#: ../lib/modules/sambaSamAccount.inc:1695
 msgid "Idle time limit"
 msgstr "Zeitlimit für Leerlauf"
 
@@ -2975,7 +3194,7 @@ msgstr ""
 msgid "If checked Unix password will also be used as Samba password."
 msgstr "Falls aktiviert wird das Unix-Passwort auch als Samba-Passwort verwendet."
 
-#: ../lib/modules/posixAccount.inc:375
+#: ../lib/modules/posixAccount.inc:378
 msgid ""
 "If checked account will be deactivated by putting a \"!\" before the "
 "encrypted password."
@@ -3013,7 +3232,7 @@ msgstr ""
 "Falls leer wird die GID-Nummer automatisch auf Basis Ihrer "
 "Konfigurationseinstellungen generiert."
 
-#: ../lib/modules/posixAccount.inc:330
+#: ../lib/modules/posixAccount.inc:333
 msgid "If empty UID number will be generated automaticly."
 msgstr "Falls leer wird die UID-Nummer automatisch generiert."
 
@@ -3033,6 +3252,16 @@ msgstr ""
 "Dies legt fest, ob Benutzer das Passwort beim ersten Login ändern müssen, "
 "falls es vorher durch einen Administrator geändert wurde."
 
+#: ../lib/modules/asteriskAccount.inc:207
+msgid ""
+"If registration context is specified, Asterisk will dynamically create and "
+"destroy a NoOp priority 1 extension for a given peer who registers or "
+"unregisters with Asterisk."
+msgstr ""
+"Wenn ein Registrierungskontext angegeben wurde, erstellt und löscht Asterisk "
+"dynamisch eine NoOp-Erweiterung mit Priorität 1 für den Teilnehmer der sich "
+"an Asterisk an-/abmeldet."
+
 #: ../lib/modules/sambaDomain.inc:103
 msgid "If set then users need to login to change their password."
 msgstr "Falls aktiviert, dann müssen sich Benutzer zur Passwortänderung anmelden."
@@ -3130,8 +3359,8 @@ msgstr "Informationen über den LDAP-Server."
 
 #: ../lib/modules/sambaSamAccount.inc:215
 #: ../lib/modules/sambaSamAccount.inc:338
-#: ../lib/modules/sambaSamAccount.inc:1398
-#: ../lib/modules/sambaSamAccount.inc:1672
+#: ../lib/modules/sambaSamAccount.inc:1416
+#: ../lib/modules/sambaSamAccount.inc:1690
 msgid "Inherit client startup configuration"
 msgstr "Client-Startkonfiguration verwenden"
 
@@ -3145,8 +3374,8 @@ msgstr "Erbt von"
 
 #: ../lib/modules/sambaSamAccount.inc:216
 #: ../lib/modules/sambaSamAccount.inc:341
-#: ../lib/modules/sambaSamAccount.inc:1400
-#: ../lib/modules/sambaSamAccount.inc:1673
+#: ../lib/modules/sambaSamAccount.inc:1418
+#: ../lib/modules/sambaSamAccount.inc:1691
 msgid "Initial program"
 msgstr "Startprogramm"
 
@@ -3182,10 +3411,19 @@ msgstr ""
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "Das weiche Inode-Quota muss kleiner sein als das harte Inode-Quota."
 
-#: ../templates/selfService/adminMain.php:471
+#: ../templates/selfService/adminMain.php:456
 msgid "Input fields"
 msgstr "Eingabefelder"
 
+#: ../lib/modules/asteriskAccount.inc:146
+#: ../lib/modules/asteriskAccount.inc:263
+#: ../lib/modules/asteriskAccount.inc:339
+#: ../lib/modules/asteriskAccount.inc:455
+#: ../lib/modules/asteriskAccount.inc:769
+#: ../lib/modules/asteriskAccount.inc:1214
+msgid "Insecure"
+msgstr "Unsicher"
+
 #: ../lib/modules/sambaSamAccount.inc:87
 msgid "Inserted user or group name in home path."
 msgstr "Benutzer- oder Gruppenname wurde in Heimatverzeichnis eingefügt."
@@ -3210,14 +3448,14 @@ msgstr "Ungültiges RDN-Attribut!"
 msgid "Invalid account"
 msgstr "Ungültiger Account"
 
-#: ../lib/modules/imapAccess.inc:140
+#: ../lib/modules/imapAccess.inc:159
 msgid "Invalid password for IMAP admin or other problem occured."
 msgstr "Das IMAP-Passwort ist falsch oder anderer Fehler ist aufgetreten."
 
 #: ../lib/modules/kolabUser.inc:118 ../lib/modules/kolabUser.inc:123
 #: ../lib/modules/kolabUser.inc:170 ../lib/modules/kolabUser.inc:214
-#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:790
-#: ../lib/modules/kolabUser.inc:902
+#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:791
+#: ../lib/modules/kolabUser.inc:903
 msgid "Invitation policy"
 msgstr "Einladungsregeln"
 
@@ -3233,7 +3471,7 @@ msgstr "Islamabad, Karachi"
 msgid "It is not possible to delete all ranges."
 msgstr "Sie können nicht alle Adressbereiche löschen."
 
-#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixGroup.inc:475 ../lib/modules/posixAccount.inc:75
 msgid ""
 "It is possible that this ID-number is reused. This can cause several "
 "problems because files with old permissions might still exist. To avoid this "
@@ -3244,22 +3482,22 @@ msgstr ""
 "können. Zur Vermeidung dieser Warnung können Sie die maximale UID-Nummer in "
 "den Optionen erhöhen."
 
-#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:138
-#: ../lib/modules/inetOrgPerson.inc:207 ../lib/modules/inetOrgPerson.inc:258
-#: ../lib/modules/inetOrgPerson.inc:455 ../lib/modules/inetOrgPerson.inc:487
-#: ../lib/modules/inetOrgPerson.inc:920 ../lib/modules/inetOrgPerson.inc:1101
+#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:269 ../lib/modules/inetOrgPerson.inc:320
+#: ../lib/modules/inetOrgPerson.inc:517 ../lib/modules/inetOrgPerson.inc:549
+#: ../lib/modules/inetOrgPerson.inc:989 ../lib/modules/inetOrgPerson.inc:1170
 msgid "Job title"
 msgstr "Berufsbezeichnung"
 
-#: ../lib/modules/inetOrgPerson.inc:488
+#: ../lib/modules/inetOrgPerson.inc:550
 msgid "Job title of user: President, department manager, ..."
 msgstr "Berufsbezeichnung des Benutzers: Präsident, Abteilungsleiter, ..."
 
-#: ../lib/lists.inc:285
+#: ../lib/lists.inc:283
 msgid "Jump 10 pages backward"
 msgstr "Springe 10 Seiten zurück"
 
-#: ../lib/lists.inc:305
+#: ../lib/lists.inc:303
 msgid "Jump 10 pages forward"
 msgstr "Springe 10 Seiten vorwärts"
 
@@ -3276,11 +3514,11 @@ msgstr "Wechseln des Attributtyps"
 msgid "Jump to an object class"
 msgstr "Wechseln der Objektklasse"
 
-#: ../lib/lists.inc:280
+#: ../lib/lists.inc:278
 msgid "Jump to first page"
 msgstr "Springe zur ersten Seite"
 
-#: ../lib/lists.inc:310
+#: ../lib/lists.inc:308
 msgid "Jump to last page"
 msgstr "Springe zur letzten Seite"
 
@@ -3306,8 +3544,8 @@ msgstr "LAM-Einstellungen"
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "LAM hat Ihre Eingaben überprüft und kann die Accounts nun erstellen."
 
-#: ../lib/modules/posixGroup.inc:410 ../lib/modules/posixAccount.inc:326
-#: ../lib/modules/inetOrgPerson.inc:588
+#: ../lib/modules/posixGroup.inc:410 ../lib/modules/posixAccount.inc:329
+#: ../lib/modules/inetOrgPerson.inc:650
 msgid ""
 "LAM supports CRYPT, SHA, SSHA, MD5 and SMD5 to generate the hash value of "
 "passwords. SSHA and CRYPT are the most common but CRYPT does not support "
@@ -3323,7 +3561,7 @@ msgstr ""
 msgid "LAM tests"
 msgstr "LAM-Tests"
 
-#: ../lib/modules/imapAccess.inc:105
+#: ../lib/modules/imapAccess.inc:114
 msgid "LAM user password"
 msgstr "LAM-Benutzerpasswort"
 
@@ -3340,11 +3578,11 @@ msgstr "LAM konnte keine Samba 3 Domäne mit diesem Namen finden!"
 msgid "LAM was unable to find a domain with this name!"
 msgstr "LAM konnte keine Domäne mit diesem Namen finden!"
 
-#: ../lib/modules/posixAccount.inc:91
+#: ../lib/modules/posixAccount.inc:93
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM konnte keine Gruppe mit diesem Namen finden!"
 
-#: ../lib/modules/posixAccount.inc:1553
+#: ../lib/modules/posixAccount.inc:1564
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM konnte die Gruppenzugehörigkeiten für Gruppe %s nicht ändern."
@@ -3385,7 +3623,7 @@ msgstr "LDAP-Filter"
 msgid "LDAP operation successful."
 msgstr "LDAP-Operation war erfolgreich."
 
-#: ../templates/selfService/adminMain.php:369
+#: ../templates/selfService/adminMain.php:337
 msgid "LDAP password"
 msgstr "LDAP-Passwort"
 
@@ -3393,7 +3631,7 @@ msgstr "LDAP-Passwort"
 msgid "LDAP search"
 msgstr "LDAP-Suche"
 
-#: ../templates/selfService/adminMain.php:380 ../help/help.inc:168
+#: ../templates/selfService/adminMain.php:342 ../help/help.inc:168
 msgid "LDAP search attribute"
 msgstr "LDAP-Suchattribut"
 
@@ -3416,7 +3654,7 @@ msgstr ""
 "angezeigt."
 
 #: ../templates/config/confmain.php:345 ../templates/config/conftypes.php:234
-#: ../templates/selfService/adminMain.php:345
+#: ../templates/selfService/adminMain.php:331
 #: ../templates/profedit/profilepage.php:189 ../help/help.inc:67
 #: ../help/help.inc:164
 msgid "LDAP suffix"
@@ -3426,7 +3664,7 @@ msgstr "LDAP-Suffix"
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP-Upload läuft. Bitte warten."
 
-#: ../templates/selfService/adminMain.php:357
+#: ../templates/selfService/adminMain.php:335
 msgid "LDAP user"
 msgstr "LDAP-Benutzer"
 
@@ -3488,7 +3726,7 @@ msgstr "Lamdaemon: Quotas lesen"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../templates/config/confmain.php:437
+#: ../templates/config/confmain.php:435
 msgid "Language is not defined!"
 msgstr "Sprache ist nicht definiert!"
 
@@ -3498,21 +3736,21 @@ msgstr "Spacheinstellungen"
 
 #: ../lib/modules/phpGroupwareUser.inc:99
 #: ../lib/modules/phpGroupwareUser.inc:174
-#: ../lib/modules/phpGroupwareUser.inc:350
+#: ../lib/modules/phpGroupwareUser.inc:351
 msgid "Last login"
 msgstr "Letzter Login"
 
 #: ../lib/modules/phpGroupwareUser.inc:98
 #: ../lib/modules/phpGroupwareUser.inc:181
-#: ../lib/modules/phpGroupwareUser.inc:345
+#: ../lib/modules/phpGroupwareUser.inc:346
 msgid "Last login from"
 msgstr "Letzter Login von"
 
 #: ../lib/types/user.inc:97 ../lib/modules/inetOrgPerson.inc:49
-#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:241
-#: ../lib/modules/inetOrgPerson.inc:410 ../lib/modules/inetOrgPerson.inc:495
-#: ../lib/modules/inetOrgPerson.inc:828 ../lib/modules/inetOrgPerson.inc:1103
-#: ../lib/modules/inetOrgPerson.inc:1459
+#: ../lib/modules/inetOrgPerson.inc:119 ../lib/modules/inetOrgPerson.inc:303
+#: ../lib/modules/inetOrgPerson.inc:472 ../lib/modules/inetOrgPerson.inc:557
+#: ../lib/modules/inetOrgPerson.inc:897 ../lib/modules/inetOrgPerson.inc:1172
+#: ../lib/modules/inetOrgPerson.inc:1528
 msgid "Last name"
 msgstr "Nachname"
 
@@ -3520,18 +3758,27 @@ msgstr "Nachname"
 msgid "Last name contains invalid characters or is empty!"
 msgstr "Nachname enthält ungültige Zeichen oder ist leer!"
 
-#: ../lib/modules/inetOrgPerson.inc:496
+#: ../lib/modules/inetOrgPerson.inc:558
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "Nachname des Benutzers. Es sind nur Buchstaben, - und Leerzeichen erlaubt."
 
 #: ../lib/modules/shadowAccount.inc:160 ../lib/modules/shadowAccount.inc:192
-#: ../lib/modules/shadowAccount.inc:349 ../lib/modules/shadowAccount.inc:452
+#: ../lib/modules/shadowAccount.inc:350 ../lib/modules/shadowAccount.inc:464
 msgid "Last password change"
 msgstr "Letzte Passwortänderung"
 
+#: ../lib/modules/asteriskAccount.inc:230
+#: ../lib/modules/asteriskAccount.inc:305
+#: ../lib/modules/asteriskAccount.inc:360
+#: ../lib/modules/asteriskAccount.inc:608
+#: ../lib/modules/asteriskAccount.inc:966
+#: ../lib/modules/asteriskAccount.inc:1277
+msgid "Last qualify milliseconds"
+msgstr "Millisekunden seit letzter Verbindung"
+
 #: ../lib/modules/dhcp_settings.inc:130 ../lib/modules/dhcp_settings.inc:173
 #: ../lib/modules/dhcp_settings.inc:187 ../lib/modules/dhcp_settings.inc:216
-#: ../lib/modules/dhcp_settings.inc:522 ../lib/modules/dhcp_settings.inc:611
+#: ../lib/modules/dhcp_settings.inc:526 ../lib/modules/dhcp_settings.inc:615
 msgid "Lease time"
 msgstr "Lease-Zeit"
 
@@ -3539,7 +3786,7 @@ msgstr "Lease-Zeit"
 msgid "Line ends"
 msgstr "Zeilenenden"
 
-#: ../templates/selfService/adminMain.php:295
+#: ../templates/selfService/adminMain.php:317
 msgid "Link to self service login page for your users"
 msgstr "Link zum SelfService für Ihre Benutzer"
 
@@ -3559,10 +3806,18 @@ msgstr ""
 "Liste der Samba-Arbeitsstationen, auf welchen sich der Benutzer anmelden "
 "darf. Leer heißt jede Arbeitsstation."
 
-#: ../templates/config/confmain.php:431
+#: ../templates/config/confmain.php:429
 msgid "List of admin users is empty or invalid!"
 msgstr "Liste der berechtigten Benutzer ist ungültig!"
 
+#: ../lib/modules/asteriskAccount.inc:195
+msgid "List of allowed codecs."
+msgstr "Liste der erlaubten Codecs."
+
+#: ../lib/modules/asteriskAccount.inc:191
+msgid "List of disallowed codecs."
+msgstr "Liste der unerlaubten Codecs."
+
 #: ../templates/tree/delete_form.php:130
 msgid "List of entries to be deleted:"
 msgstr "Liste der zu löschenden Einträge:"
@@ -3595,17 +3850,17 @@ msgstr "Lokale Gruppe"
 #: ../lib/modules/ipHost.inc:98 ../lib/modules/ipHost.inc:149
 #: ../lib/modules/ipHost.inc:312 ../lib/modules/device.inc:66
 #: ../lib/modules/device.inc:97 ../lib/modules/device.inc:112
-#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:382
-#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:129
-#: ../lib/modules/inetOrgPerson.inc:187 ../lib/modules/inetOrgPerson.inc:378
-#: ../lib/modules/inetOrgPerson.inc:425 ../lib/modules/inetOrgPerson.inc:563
-#: ../lib/modules/inetOrgPerson.inc:864 ../lib/modules/inetOrgPerson.inc:1120
-#: ../lib/modules/inetOrgPerson.inc:1536
+#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:383
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:138
+#: ../lib/modules/inetOrgPerson.inc:249 ../lib/modules/inetOrgPerson.inc:440
+#: ../lib/modules/inetOrgPerson.inc:487 ../lib/modules/inetOrgPerson.inc:625
+#: ../lib/modules/inetOrgPerson.inc:933 ../lib/modules/inetOrgPerson.inc:1189
+#: ../lib/modules/inetOrgPerson.inc:1605
 msgid "Location"
 msgstr "Ort"
 
-#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:251
-#: ../lib/modules/posixAccount.inc:995
+#: ../lib/modules/posixGroup.inc:196 ../lib/modules/posixAccount.inc:254
+#: ../lib/modules/posixAccount.inc:1006
 msgid "Lock password"
 msgstr "Passwort deaktivieren"
 
@@ -3659,11 +3914,11 @@ msgstr "Logging"
 msgid "Login"
 msgstr "Login"
 
-#: ../templates/selfService/adminMain.php:406 ../help/help.inc:170
+#: ../templates/selfService/adminMain.php:350 ../help/help.inc:170
 msgid "Login attribute label"
 msgstr "Beschriftung des Login-Attributs"
 
-#: ../templates/selfService/adminMain.php:419 ../help/help.inc:172
+#: ../templates/selfService/adminMain.php:354 ../help/help.inc:172
 msgid "Login caption"
 msgstr "Login-Überschrift"
 
@@ -3671,10 +3926,10 @@ msgstr "Login-Überschrift"
 msgid "Login method"
 msgstr "Login-Methode"
 
-#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:237
-#: ../lib/modules/posixAccount.inc:306 ../lib/modules/posixAccount.inc:378
-#: ../lib/modules/posixAccount.inc:988 ../lib/modules/posixAccount.inc:1090
-#: ../lib/modules/posixAccount.inc:1156
+#: ../lib/types/user.inc:99 ../lib/modules/posixAccount.inc:240
+#: ../lib/modules/posixAccount.inc:309 ../lib/modules/posixAccount.inc:381
+#: ../lib/modules/posixAccount.inc:999 ../lib/modules/posixAccount.inc:1101
+#: ../lib/modules/posixAccount.inc:1167
 msgid "Login shell"
 msgstr "Login Shell"
 
@@ -3691,9 +3946,9 @@ msgstr "Anmeldung für Passwortänderung"
 #: ../lib/modules/sambaSamAccount.inc:317
 #: ../lib/modules/sambaSamAccount.inc:320
 #: ../lib/modules/sambaSamAccount.inc:501
-#: ../lib/modules/sambaSamAccount.inc:572
-#: ../lib/modules/sambaSamAccount.inc:1182
-#: ../lib/modules/sambaSamAccount.inc:1519
+#: ../lib/modules/sambaSamAccount.inc:579
+#: ../lib/modules/sambaSamAccount.inc:1196
+#: ../lib/modules/sambaSamAccount.inc:1537
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
@@ -3701,10 +3956,10 @@ msgstr "Anmeldezeiten"
 #: ../lib/modules/sambaSamAccount.inc:205
 #: ../lib/modules/sambaSamAccount.inc:289
 #: ../lib/modules/sambaSamAccount.inc:485
-#: ../lib/modules/sambaSamAccount.inc:570
-#: ../lib/modules/sambaSamAccount.inc:1135
-#: ../lib/modules/sambaSamAccount.inc:1495
-#: ../lib/modules/sambaSamAccount.inc:1642
+#: ../lib/modules/sambaSamAccount.inc:575
+#: ../lib/modules/sambaSamAccount.inc:1149
+#: ../lib/modules/sambaSamAccount.inc:1513
+#: ../lib/modules/sambaSamAccount.inc:1660
 msgid "Logon script"
 msgstr "Anmeldeskript"
 
@@ -3713,8 +3968,8 @@ msgid "Logon script is invalid!"
 msgstr "Anmeldeskript ist ungültig!"
 
 #: ../templates/selfService/selfServiceMain.php:53
-#: ../templates/selfService/selfServiceMain.php:336
-#: ../templates/main_header.php:96
+#: ../templates/selfService/selfServiceMain.php:358
+#: ../templates/main_header.php:104
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -3725,7 +3980,7 @@ msgstr "M-Knoten (0x04)"
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ieee802device.inc:51
 #: ../lib/modules/ieee802device.inc:61 ../lib/modules/ieee802device.inc:72
 #: ../lib/modules/ieee802device.inc:104 ../lib/modules/fixed_ip.inc:90
-#: ../lib/modules/fixed_ip.inc:334 ../lib/modules/fixed_ip.inc:513
+#: ../lib/modules/fixed_ip.inc:334 ../lib/modules/fixed_ip.inc:516
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
@@ -3745,13 +4000,13 @@ msgstr "Magadan, Solomon-Inseln"
 msgid "Mail aliases"
 msgstr "Mail-Aliase"
 
-#: ../lib/modules/imapAccess.inc:87 ../lib/modules/imapAccess.inc:109
+#: ../lib/modules/imapAccess.inc:90 ../lib/modules/imapAccess.inc:118
 msgid "Mail domain(s)"
 msgstr "Maildomäne(n)"
 
 #: ../lib/modules/kolabUser.inc:88 ../lib/modules/kolabUser.inc:159
 #: ../lib/modules/kolabUser.inc:207 ../lib/modules/kolabUser.inc:220
-#: ../lib/modules/kolabUser.inc:306 ../lib/modules/kolabUser.inc:774
+#: ../lib/modules/kolabUser.inc:306 ../lib/modules/kolabUser.inc:775
 msgid "Mail quota"
 msgstr "Mail-Quota"
 
@@ -3778,26 +4033,32 @@ msgstr "Mailserver"
 msgid "Mail successfully sent to %s."
 msgstr "Mail wurde erfolgreich an %s gesendet."
 
+#: ../lib/modules/asteriskAccount.inc:150
+#: ../lib/modules/asteriskAccount.inc:265
+#: ../lib/modules/asteriskAccount.inc:340
+#: ../lib/modules/asteriskAccount.inc:463
+#: ../lib/modules/asteriskAccount.inc:778
+#: ../lib/modules/asteriskAccount.inc:1217
 #: ../lib/modules/asteriskVoicemail.inc:86
 #: ../lib/modules/asteriskVoicemail.inc:129
 #: ../lib/modules/asteriskVoicemail.inc:149
 #: ../lib/modules/asteriskVoicemail.inc:236
-#: ../lib/modules/asteriskVoicemail.inc:390 ../lib/modules/imapAccess.inc:52
-#: ../lib/modules/imapAccess.inc:90 ../lib/modules/imapAccess.inc:177
+#: ../lib/modules/asteriskVoicemail.inc:390 ../lib/modules/imapAccess.inc:55
+#: ../lib/modules/imapAccess.inc:96 ../lib/modules/imapAccess.inc:214
 msgid "Mailbox"
 msgstr "Postfach"
 
-#: ../lib/modules/imapAccess.inc:185
+#: ../lib/modules/imapAccess.inc:223
 msgid "Mailbox already exists on IMAP server."
 msgstr "Das Postfach existiert bereits auf dem IMAP-Server."
 
-#: ../lib/modules/imapAccess.inc:192
+#: ../lib/modules/imapAccess.inc:230
 msgid "Mailbox does not exist on IMAP server."
 msgstr "Das Postfach existiert noch nicht auf dem IMAP-Server."
 
 #: ../lib/modules/kolabUser.inc:151 ../lib/modules/kolabUser.inc:182
 #: ../lib/modules/kolabUser.inc:216 ../lib/modules/kolabUser.inc:292
-#: ../lib/modules/kolabUser.inc:297 ../lib/modules/kolabUser.inc:770
+#: ../lib/modules/kolabUser.inc:297 ../lib/modules/kolabUser.inc:771
 msgid "Mailbox home server"
 msgstr "Mailserver"
 
@@ -3821,7 +4082,7 @@ msgstr "Mails an diesen Namen werden an die Empfänger weitergeleitet."
 msgid "Main"
 msgstr "Allgemein"
 
-#: ../templates/selfService/adminMain.php:432 ../help/help.inc:174
+#: ../templates/selfService/adminMain.php:356 ../help/help.inc:174
 msgid "Main page caption"
 msgstr "Überschrift der Hauptseite"
 
@@ -3847,10 +4108,10 @@ msgstr "Verwaltete Suffixe"
 
 #: ../lib/modules/ipHost.inc:70 ../lib/modules/ipHost.inc:90
 #: ../lib/modules/ipHost.inc:99 ../lib/modules/ipHost.inc:170
-#: ../lib/modules/ipHost.inc:315 ../lib/modules/inetOrgPerson.inc:217
-#: ../lib/modules/inetOrgPerson.inc:274 ../lib/modules/inetOrgPerson.inc:470
-#: ../lib/modules/inetOrgPerson.inc:503 ../lib/modules/inetOrgPerson.inc:950
-#: ../lib/modules/inetOrgPerson.inc:1105
+#: ../lib/modules/ipHost.inc:315 ../lib/modules/inetOrgPerson.inc:279
+#: ../lib/modules/inetOrgPerson.inc:336 ../lib/modules/inetOrgPerson.inc:532
+#: ../lib/modules/inetOrgPerson.inc:565 ../lib/modules/inetOrgPerson.inc:1019
+#: ../lib/modules/inetOrgPerson.inc:1174
 msgid "Manager"
 msgstr "Vorgesetzter"
 
@@ -3893,7 +4154,7 @@ msgstr "Account als gelöscht markieren"
 msgid "Mark for deletion"
 msgstr "Als gelöscht markieren"
 
-#: ../templates/config/profmanage.php:377
+#: ../templates/config/profmanage.php:381
 #: ../templates/selfService/profManage.php:280 ../help/help.inc:128
 msgid "Master password"
 msgstr "Hauptpasswort"
@@ -3928,17 +4189,17 @@ msgstr "Maximale GID-Nummer ist ungültig oder leer!"
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "Die maximale GID-Nummer muss größer sein als die minimale GID-Nummer!"
 
-#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:64
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:164 ../lib/modules/posixAccount.inc:173
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:68
+#: ../lib/modules/posixAccount.inc:167 ../lib/modules/posixAccount.inc:176
 msgid "Maximum UID number"
 msgstr "Maximale UID-Nummer"
 
-#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:64
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:66
 msgid "Maximum UID number is invalid!"
 msgstr "Maximale UID-Nummer ist ungültig!"
 
-#: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
+#: ../lib/modules/posixAccount.inc:67 ../lib/modules/posixAccount.inc:68
 msgid "Maximum UID number must be greater than minimum UID number!"
 msgstr "Die maximale UID-Nummer muss größer sein als die minimale UID-Nummer!"
 
@@ -3955,7 +4216,7 @@ msgstr "Maximale Dateigröße: %s"
 
 #: ../lib/modules/dhcp_settings.inc:133 ../lib/modules/dhcp_settings.inc:174
 #: ../lib/modules/dhcp_settings.inc:188 ../lib/modules/dhcp_settings.inc:222
-#: ../lib/modules/dhcp_settings.inc:524 ../lib/modules/dhcp_settings.inc:612
+#: ../lib/modules/dhcp_settings.inc:528 ../lib/modules/dhcp_settings.inc:616
 msgid "Maximum lease time"
 msgstr "Maximale Lease-Zeit"
 
@@ -3963,14 +4224,20 @@ msgstr "Maximale Lease-Zeit"
 msgid "Maximum length"
 msgstr "Maximale Länge"
 
-#: ../lib/lists.inc:868 ../help/help.inc:89
+#: ../lib/lists.inc:866 ../help/help.inc:89
 msgid "Maximum list entries"
 msgstr "Maximale Listeneinträge"
 
+#: ../lib/modules/asteriskAccount.inc:187
+msgid "Maximum number of seconds of inactivity before terminating a call on hold."
+msgstr ""
+"Maximale Zeit in Sekunden bevor ein geparkter Anruf nach Inaktivität beendet "
+"wird."
+
 #: ../lib/types/ppolicyType.inc:79 ../lib/modules/shadowAccount.inc:59
 #: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:116
 #: ../lib/modules/shadowAccount.inc:180 ../lib/modules/shadowAccount.inc:218
-#: ../lib/modules/shadowAccount.inc:325 ../lib/modules/shadowAccount.inc:457
+#: ../lib/modules/shadowAccount.inc:326 ../lib/modules/shadowAccount.inc:469
 #: ../lib/modules/ppolicy.inc:80 ../lib/modules/ppolicy.inc:136
 #: ../lib/modules/ppolicy.inc:159 ../lib/modules/ppolicy.inc:160
 #: ../lib/modules/ppolicy.inc:196 ../lib/modules/ppolicy.inc:447
@@ -3982,14 +4249,18 @@ msgstr "Maximales Passwortalter"
 
 #: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:85
 #: ../lib/modules/nisnetgroup.inc:89 ../lib/modules/nisnetgroup.inc:122
-#: ../lib/modules/nisnetgroup.inc:132 ../lib/modules/nisnetgroup.inc:275
-#: ../lib/modules/nisnetgroup.inc:579 ../lib/modules/groupOfNames.inc:72
-#: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:103
-#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/groupOfNames.inc:173
-#: ../lib/modules/groupOfNames.inc:459
+#: ../lib/modules/nisnetgroup.inc:132 ../lib/modules/nisnetgroup.inc:276
+#: ../lib/modules/nisnetgroup.inc:580 ../lib/modules/groupOfNames.inc:72
+#: ../lib/modules/groupOfNames.inc:76 ../lib/modules/groupOfNames.inc:109
+#: ../lib/modules/groupOfNames.inc:117 ../lib/modules/groupOfNames.inc:128
+#: ../lib/modules/groupOfNames.inc:193 ../lib/modules/groupOfNames.inc:487
 msgid "Members"
 msgstr "Mitglieder"
 
+#: ../lib/modules/groupOfNames.inc:80 ../lib/modules/groupOfNames.inc:132
+msgid "Members are optional"
+msgstr "Mitglieder sind optional"
+
 #: ../lib/modules/sambaSamAccount.inc:537
 msgid "Mid-Atlantic"
 msgstr "Mittelatlantik"
@@ -3998,7 +4269,7 @@ msgstr "Mittelatlantik"
 msgid "Midway Island, Samoa"
 msgstr "Midway Island, Samoa"
 
-#: ../lib/modules/inetOrgPerson.inc:243
+#: ../lib/modules/inetOrgPerson.inc:305
 msgid "Miller"
 msgstr "Müller"
 
@@ -4015,12 +4286,12 @@ msgstr "Minimale GID-Nummer"
 msgid "Minimum GID number is invalid or empty!"
 msgstr "Minimale GID-Nummer ist ungültig oder leer!"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
-#: ../lib/modules/posixAccount.inc:161 ../lib/modules/posixAccount.inc:170
+#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:65
+#: ../lib/modules/posixAccount.inc:164 ../lib/modules/posixAccount.inc:173
 msgid "Minimum UID number"
 msgstr "Minimale UID-Nummer"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:63 ../lib/modules/posixAccount.inc:65
 msgid "Minimum UID number is invalid!"
 msgstr "Minimale UID-Nummer ist ungültig!"
 
@@ -4038,8 +4309,8 @@ msgstr "Minimale Anzahl von Zahlen"
 
 #: ../lib/types/ppolicyType.inc:78 ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:111 ../lib/modules/shadowAccount.inc:176
-#: ../lib/modules/shadowAccount.inc:212 ../lib/modules/shadowAccount.inc:318
-#: ../lib/modules/shadowAccount.inc:456 ../lib/modules/ppolicy.inc:76
+#: ../lib/modules/shadowAccount.inc:212 ../lib/modules/shadowAccount.inc:319
+#: ../lib/modules/shadowAccount.inc:468 ../lib/modules/ppolicy.inc:76
 #: ../lib/modules/ppolicy.inc:135 ../lib/modules/ppolicy.inc:158
 #: ../lib/modules/ppolicy.inc:190 ../lib/modules/ppolicy.inc:446
 #: ../lib/modules/sambaDomain.inc:118 ../lib/modules/sambaDomain.inc:189
@@ -4064,14 +4335,14 @@ msgid "Minimum uppercase characters"
 msgstr "Minimale Anzahl von Großbuchstaben"
 
 #: ../lib/types/user.inc:158 ../lib/modules/inetOrgPerson.inc:55
-#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:201
-#: ../lib/modules/inetOrgPerson.inc:338 ../lib/modules/inetOrgPerson.inc:446
-#: ../lib/modules/inetOrgPerson.inc:527 ../lib/modules/inetOrgPerson.inc:528
-#: ../lib/modules/inetOrgPerson.inc:902 ../lib/modules/inetOrgPerson.inc:1112
+#: ../lib/modules/inetOrgPerson.inc:120 ../lib/modules/inetOrgPerson.inc:263
+#: ../lib/modules/inetOrgPerson.inc:400 ../lib/modules/inetOrgPerson.inc:508
+#: ../lib/modules/inetOrgPerson.inc:589 ../lib/modules/inetOrgPerson.inc:590
+#: ../lib/modules/inetOrgPerson.inc:971 ../lib/modules/inetOrgPerson.inc:1181
 msgid "Mobile number"
 msgstr "Mobil"
 
-#: ../lib/modules/inetOrgPerson.inc:1487
+#: ../lib/modules/inetOrgPerson.inc:1556
 msgid "Mobile telephone number"
 msgstr "Handynummer"
 
@@ -4089,7 +4360,7 @@ msgstr "Moduleinstellungen"
 msgid "Modules"
 msgstr "Module"
 
-#: ../lib/modules/sambaSamAccount.inc:1273
+#: ../lib/modules/sambaSamAccount.inc:1287
 msgid "Monday"
 msgstr "Montag"
 
@@ -4106,27 +4377,53 @@ msgstr "Mountpunkt"
 msgid "Mountpoint of device with enabled quotas."
 msgstr "Mountpunkt des Dateisystems mit aktivierten Quota."
 
-#: ../lib/modules/zarafaGroup.inc:68 ../lib/modules/eduPerson.inc:96
-#: ../lib/modules/eduPerson.inc:108 ../lib/modules/eduPerson.inc:124
+#: ../lib/modules/zarafaGroup.inc:68 ../lib/modules/eduPerson.inc:98
+#: ../lib/modules/eduPerson.inc:110 ../lib/modules/eduPerson.inc:126
 #: ../lib/modules/sudoRole.inc:89 ../lib/modules/sudoRole.inc:94
 #: ../lib/modules/sudoRole.inc:99 ../lib/modules/sudoRole.inc:104
 #: ../lib/modules/sudoRole.inc:109 ../lib/modules/sudoRole.inc:114
 msgid "Multiple values are separated by comma."
 msgstr "Mehrere Werte werden per Komma getrennt."
 
+#: ../lib/modules/asteriskAccount.inc:198
+#: ../lib/modules/asteriskAccount.inc:289
+#: ../lib/modules/asteriskAccount.inc:352
+#: ../lib/modules/asteriskAccount.inc:550
+#: ../lib/modules/asteriskAccount.inc:890
+#: ../lib/modules/asteriskAccount.inc:1253
+msgid "Music on hold"
+msgstr "Wartemusik"
+
+#: ../lib/modules/asteriskAccount.inc:199
+msgid "Music to play on hold."
+msgstr "Wartemusik die gespielt werden soll."
+
 #: ../lib/modules/ipHost.inc:86 ../lib/modules/device.inc:99
-#: ../lib/modules/inetOrgPerson.inc:380
+#: ../lib/modules/inetOrgPerson.inc:442
 msgid "MyCity"
 msgstr "MeineStadt"
 
-#: ../lib/modules/inetOrgPerson.inc:308
+#: ../lib/modules/inetOrgPerson.inc:370
 msgid "Mycity"
 msgstr "Stadt"
 
-#: ../lib/modules/inetOrgPerson.inc:292
+#: ../lib/modules/inetOrgPerson.inc:354
 msgid "Mystreetname 42"
 msgstr "Musterstraße 42"
 
+#: ../lib/modules/asteriskAccount.inc:154
+#: ../lib/modules/asteriskAccount.inc:267
+#: ../lib/modules/asteriskAccount.inc:341
+#: ../lib/modules/asteriskAccount.inc:470
+#: ../lib/modules/asteriskAccount.inc:791
+#: ../lib/modules/asteriskAccount.inc:1220
+msgid "NAT"
+msgstr "NAT"
+
+#: ../lib/modules/asteriskAccount.inc:155
+msgid "NAT setting for this account."
+msgstr "NAT-Einstellung für diesen Account."
+
 #: ../lib/modules/nisnetgroup.inc:57
 msgid "NIS net group"
 msgstr "NIS Netzgruppe"
@@ -4153,16 +4450,20 @@ msgstr "NIS-Objekte"
 
 #: ../templates/tree/templates/creation/new_ou_template.php:59
 #: ../templates/tree/templates/creation/new_ou_template.php:104
+#: ../templates/masscreate.php:260 ../templates/masscreate.php:335
 #: ../templates/schema/schema.php:266 ../templates/pdfedit/pdfdelete.php:88
-#: ../lib/types/ppolicyType.inc:77 ../lib/modules/device.inc:54
-#: ../lib/modules/device.inc:78 ../lib/modules/device.inc:109
-#: ../lib/modules/device.inc:151 ../lib/modules/device.inc:370
-#: ../lib/modules/nisObject.inc:54 ../lib/modules/nisObject.inc:74
-#: ../lib/modules/nisObject.inc:104 ../lib/modules/nisObject.inc:130
-#: ../lib/modules/nisObject.inc:210 ../lib/modules/ppolicy.inc:72
-#: ../lib/modules/ppolicy.inc:134 ../lib/modules/ppolicy.inc:157
-#: ../lib/modules/ppolicy.inc:182 ../lib/modules/ppolicy.inc:445
-#: ../lib/modules/groupOfNames.inc:142
+#: ../lib/types/automountType.inc:77 ../lib/types/ppolicyType.inc:77
+#: ../lib/modules/device.inc:54 ../lib/modules/device.inc:78
+#: ../lib/modules/device.inc:109 ../lib/modules/device.inc:151
+#: ../lib/modules/device.inc:371 ../lib/modules/nisObject.inc:54
+#: ../lib/modules/nisObject.inc:74 ../lib/modules/nisObject.inc:104
+#: ../lib/modules/nisObject.inc:130 ../lib/modules/nisObject.inc:210
+#: ../lib/modules/ppolicy.inc:72 ../lib/modules/ppolicy.inc:134
+#: ../lib/modules/ppolicy.inc:157 ../lib/modules/ppolicy.inc:182
+#: ../lib/modules/ppolicy.inc:445 ../lib/modules/automount.inc:54
+#: ../lib/modules/automount.inc:70 ../lib/modules/automount.inc:93
+#: ../lib/modules/automount.inc:118 ../lib/modules/automount.inc:190
+#: ../lib/modules/groupOfNames.inc:162
 msgid "Name"
 msgstr "Name"
 
@@ -4175,19 +4476,19 @@ msgstr ""
 "Namen existiert wird es überschrieben."
 
 #: ../lib/modules/dhcp_settings.inc:163 ../lib/modules/dhcp_settings.inc:180
-#: ../lib/modules/dhcp_settings.inc:550 ../lib/modules/dhcp_settings.inc:618
+#: ../lib/modules/dhcp_settings.inc:554 ../lib/modules/dhcp_settings.inc:622
 msgid "Net mask"
 msgstr "Netzmaske"
 
 #: ../lib/modules/dhcp_settings.inc:142 ../lib/modules/dhcp_settings.inc:177
 #: ../lib/modules/dhcp_settings.inc:191 ../lib/modules/dhcp_settings.inc:240
-#: ../lib/modules/dhcp_settings.inc:530 ../lib/modules/dhcp_settings.inc:615
+#: ../lib/modules/dhcp_settings.inc:534 ../lib/modules/dhcp_settings.inc:619
 msgid "Netbios name servers"
 msgstr "Netbios-Name-Server"
 
 #: ../lib/modules/dhcp_settings.inc:145 ../lib/modules/dhcp_settings.inc:178
 #: ../lib/modules/dhcp_settings.inc:193 ../lib/modules/dhcp_settings.inc:246
-#: ../lib/modules/dhcp_settings.inc:540 ../lib/modules/dhcp_settings.inc:616
+#: ../lib/modules/dhcp_settings.inc:544 ../lib/modules/dhcp_settings.inc:620
 msgid "Netbios node type"
 msgstr "Netbios-Knotentyp"
 
@@ -4215,7 +4516,7 @@ msgstr "Neue OU erfolgreich erstellt."
 msgid "New SSH public key"
 msgstr "Neuer öffentlicher SSH-Schlüssel"
 
-#: ../lib/modules/inetOrgPerson.inc:388
+#: ../lib/modules/inetOrgPerson.inc:450
 msgid "New York"
 msgstr "New York"
 
@@ -4224,7 +4525,11 @@ msgstr "New York"
 msgid "New alias"
 msgstr "Neuer Alias"
 
-#: ../templates/config/profmanage.php:165
+#: ../lib/types/automountType.inc:91 ../lib/types/automountType.inc:145
+msgid "New automount entry"
+msgstr "Neuer Automount-Eintrag"
+
+#: ../templates/config/profmanage.php:169
 msgid "New default profile set successfully."
 msgstr "Neues Standardprofil wurde erfolgreich gesetzt."
 
@@ -4247,7 +4552,7 @@ msgid "New group"
 msgstr "Neue Gruppe"
 
 #: ../lib/types/host.inc:108 ../lib/types/host.inc:163
-#: ../lib/modules/hostObject.inc:149
+#: ../lib/modules/hostObject.inc:150
 msgid "New host"
 msgstr "Neuer Host"
 
@@ -4272,15 +4577,15 @@ msgstr "Neues Objekt"
 msgid "New organizational unit"
 msgstr "Neue Organizational Unit"
 
-#: ../lib/modules/groupOfNames.inc:251
+#: ../lib/modules/groupOfNames.inc:271
 msgid "New owner"
 msgstr "Neuer Besitzer"
 
-#: ../templates/config/confmain.php:354 ../lib/modules/posixAccount.inc:1688
+#: ../templates/config/confmain.php:354 ../lib/modules/posixAccount.inc:1699
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../templates/config/profmanage.php:155
+#: ../templates/config/profmanage.php:159
 msgid "New password set successfully."
 msgstr "Neues Passwort wurde erfolgreich gesetzt."
 
@@ -4293,7 +4598,7 @@ msgstr "Neue Richtlinie"
 msgid "New range"
 msgstr "Neuer Adressbereich"
 
-#: ../lib/modules/nisMailAlias.inc:158
+#: ../lib/modules/nisMailAlias.inc:161
 msgid "New recipient"
 msgstr "Neuer Empfänger"
 
@@ -4365,15 +4670,15 @@ msgstr "Nächste Benutzer-RID"
 msgid "Next user RID is not a number!"
 msgstr "Nächste Benutzer-RID ist keine Zahl!"
 
-#: ../lib/modules/eduPerson.inc:86 ../lib/modules/eduPerson.inc:165
-#: ../lib/modules/eduPerson.inc:197 ../lib/modules/eduPerson.inc:297
-#: ../lib/modules/eduPerson.inc:659
+#: ../lib/modules/eduPerson.inc:88 ../lib/modules/eduPerson.inc:167
+#: ../lib/modules/eduPerson.inc:199 ../lib/modules/eduPerson.inc:311
+#: ../lib/modules/eduPerson.inc:673
 msgid "Nick names"
 msgstr "Spitznamen"
 
 #: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
 #: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
-#: ../lib/modules/imapAccess.inc:99
+#: ../lib/modules/imapAccess.inc:108
 msgid "No"
 msgstr "Nein"
 
@@ -4385,12 +4690,12 @@ msgstr "Keine DHCPs gefunden!"
 msgid "No NIS objects found!"
 msgstr "Keine NIS-Objekte gefunden!"
 
-#: ../lib/modules/sambaSamAccount.inc:1032
+#: ../lib/modules/sambaSamAccount.inc:1046
 #: ../lib/modules/sambaGroupMapping.inc:245
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Keine Samba 3 Domänen gefunden, bitte erstellen Sie eine."
 
-#: ../lib/modules/posixAccount.inc:430 ../lib/modules/posixAccount.inc:891
+#: ../lib/modules/posixAccount.inc:433 ../lib/modules/posixAccount.inc:909
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "Keine Unix-Gruppen gefunden, bitte erstellen Sie eine."
 
@@ -4398,6 +4703,10 @@ msgstr "Keine Unix-Gruppen gefunden, bitte erstellen Sie eine."
 msgid "No aliases found!"
 msgstr "Keine Aliase gefunden!"
 
+#: ../lib/types/automountType.inc:144
+msgid "No automount entries found!"
+msgstr "Keine Automount-Einträge gefunden!"
+
 #: ../templates/initsuff.php:163
 msgid "No changes were made."
 msgstr "Keine Änderungen vorgenommen."
@@ -4418,7 +4727,7 @@ msgstr "Keine Erweiterungen gefunden!"
 msgid "No file selected."
 msgstr "Keine Datei gewählt."
 
-#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixAccount.inc:72
+#: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixAccount.inc:74
 msgid "No free ID-Number!"
 msgstr "Keine ID-Nummer mehr frei!"
 
@@ -4613,17 +4922,17 @@ msgstr "Veraltet"
 msgid "Off"
 msgstr "Aus"
 
-#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:193
-#: ../lib/modules/inetOrgPerson.inc:402 ../lib/modules/inetOrgPerson.inc:434
-#: ../lib/modules/inetOrgPerson.inc:575 ../lib/modules/inetOrgPerson.inc:879
-#: ../lib/modules/inetOrgPerson.inc:1122 ../lib/modules/inetOrgPerson.inc:1557
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:255
+#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:496
+#: ../lib/modules/inetOrgPerson.inc:637 ../lib/modules/inetOrgPerson.inc:948
+#: ../lib/modules/inetOrgPerson.inc:1191 ../lib/modules/inetOrgPerson.inc:1626
 msgid "Office name"
 msgstr "Büroname"
 
 #: ../templates/tree/export_form.php:165
 #: ../templates/tests/lamdaemonTest.php:90 ../templates/ou_edit.php:185
 #: ../templates/ou_edit.php:199 ../templates/masscreate.php:195
-#: ../templates/config/profmanage.php:382
+#: ../templates/config/profmanage.php:386
 #: ../templates/config/mainmanage.php:252
 #: ../templates/config/conflogin.php:158 ../templates/config/conflogin.php:159
 #: ../templates/config/mainlogin.php:155
@@ -4631,17 +4940,17 @@ msgstr "Büroname"
 #: ../templates/selfService/profManage.php:285
 #: ../templates/selfService/adminLogin.php:152
 #: ../templates/selfService/adminLogin.php:153
-#: ../templates/selfService/adminMain.php:541
-#: ../templates/selfService/adminMain.php:584
+#: ../templates/selfService/adminMain.php:406
+#: ../templates/selfService/adminMain.php:450
 #: ../templates/profedit/profiledelete.php:91 ../lib/modules/device.inc:233
-#: ../lib/modules/device.inc:258 ../lib/modules/sambaSamAccount.inc:1329
-#: ../lib/modules/sambaSamAccount.inc:1445 ../lib/modules/zarafaUser.inc:771
-#: ../lib/modules/nisnetgroup.inc:468 ../lib/modules/nisnetgroup.inc:478
+#: ../lib/modules/device.inc:258 ../lib/modules/sambaSamAccount.inc:1343
+#: ../lib/modules/sambaSamAccount.inc:1463 ../lib/modules/zarafaUser.inc:771
+#: ../lib/modules/nisnetgroup.inc:469 ../lib/modules/nisnetgroup.inc:479
 #: ../lib/modules/asteriskExtension.inc:330 ../lib/modules/aliasEntry.inc:141
-#: ../lib/modules/aliasEntry.inc:161 ../lib/modules/imapAccess.inc:221
-#: ../lib/modules/groupOfNames.inc:233 ../lib/modules/groupOfNames.inc:257
-#: ../lib/modules/groupOfNames.inc:357 ../lib/lists.inc:645
-#: ../lib/lists.inc:896 ../lib/modules.inc:1362
+#: ../lib/modules/aliasEntry.inc:161 ../lib/modules/imapAccess.inc:266
+#: ../lib/modules/groupOfNames.inc:253 ../lib/modules/groupOfNames.inc:277
+#: ../lib/modules/groupOfNames.inc:378 ../lib/lists.inc:643
+#: ../lib/lists.inc:716 ../lib/modules.inc:1362
 msgid "Ok"
 msgstr "Ok"
 
@@ -4657,8 +4966,8 @@ msgstr "An"
 
 #: ../lib/modules/sambaSamAccount.inc:225
 #: ../lib/modules/sambaSamAccount.inc:362
-#: ../lib/modules/sambaSamAccount.inc:1431
-#: ../lib/modules/sambaSamAccount.inc:1711
+#: ../lib/modules/sambaSamAccount.inc:1449
+#: ../lib/modules/sambaSamAccount.inc:1729
 msgid "On broken or timed out connection"
 msgstr "Bei Trennung oder abgelaufenem Zeitlimit"
 
@@ -4680,7 +4989,7 @@ msgid "Optional binary attributes"
 msgstr "Optionale Binärattribute"
 
 #: ../templates/lists/changePassword.php:217 ../lib/types/sudo.inc:83
-#: ../lib/modules/zarafaGroup.inc:179 ../lib/modules/posixAccount.inc:178
+#: ../lib/modules/zarafaGroup.inc:179 ../lib/modules/posixAccount.inc:181
 #: ../lib/modules/zarafaUser.inc:478 ../lib/modules/sudoRole.inc:83
 #: ../lib/modules/sudoRole.inc:112 ../lib/modules/sudoRole.inc:164
 #: ../lib/modules/sudoRole.inc:178 ../lib/modules/sudoRole.inc:187
@@ -4703,9 +5012,9 @@ msgstr "Optionen für den Asterisk Anrufbeantworteraccount (z.B. sendvoicemail=y
 msgid "Ordering"
 msgstr "Sortierung"
 
-#: ../lib/modules/eduPerson.inc:111 ../lib/modules/eduPerson.inc:177
-#: ../lib/modules/eduPerson.inc:198 ../lib/modules/eduPerson.inc:215
-#: ../lib/modules/eduPerson.inc:339 ../lib/modules/eduPerson.inc:670
+#: ../lib/modules/eduPerson.inc:113 ../lib/modules/eduPerson.inc:179
+#: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:353 ../lib/modules/eduPerson.inc:684
 msgid "Organization"
 msgstr "Organisation"
 
@@ -4713,13 +5022,13 @@ msgstr "Organisation"
 msgid "Organizational unit"
 msgstr "Organizational Unit"
 
-#: ../lib/modules/eduPerson.inc:119 ../lib/modules/eduPerson.inc:123
-#: ../lib/modules/eduPerson.inc:189 ../lib/modules/eduPerson.inc:199
-#: ../lib/modules/eduPerson.inc:363 ../lib/modules/eduPerson.inc:676
+#: ../lib/modules/eduPerson.inc:121 ../lib/modules/eduPerson.inc:125
+#: ../lib/modules/eduPerson.inc:191 ../lib/modules/eduPerson.inc:201
+#: ../lib/modules/eduPerson.inc:377 ../lib/modules/eduPerson.inc:690
 msgid "Organizational units"
 msgstr "Organisatorische Einheiten"
 
-#: ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:221
 msgid "Organizational units contains an invalid entry."
 msgstr "Die organisatorischen Einheiten enthalten einen fehlerhaften Eintrag."
 
@@ -4744,10 +5053,10 @@ msgstr "Standardmäßige Quotaeinstellungen überschreiben."
 #: ../templates/config/confmain.php:291 ../lib/types/gon.inc:94
 #: ../lib/modules/device.inc:62 ../lib/modules/device.inc:91
 #: ../lib/modules/device.inc:111 ../lib/modules/device.inc:176
-#: ../lib/modules/device.inc:183 ../lib/modules/device.inc:376
-#: ../lib/modules/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:97
-#: ../lib/modules/groupOfNames.inc:113 ../lib/modules/groupOfNames.inc:153
-#: ../lib/modules/groupOfNames.inc:168 ../lib/modules/groupOfNames.inc:455
+#: ../lib/modules/device.inc:183 ../lib/modules/device.inc:377
+#: ../lib/modules/groupOfNames.inc:68 ../lib/modules/groupOfNames.inc:101
+#: ../lib/modules/groupOfNames.inc:127 ../lib/modules/groupOfNames.inc:173
+#: ../lib/modules/groupOfNames.inc:188 ../lib/modules/groupOfNames.inc:483
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -4756,7 +5065,7 @@ msgid "P-Node (0x02)"
 msgstr "P-Knoten (0x02)"
 
 #: ../lib/modules/fixed_ip.inc:87 ../lib/modules/fixed_ip.inc:330
-#: ../lib/modules/fixed_ip.inc:513
+#: ../lib/modules/fixed_ip.inc:516
 msgid "PC name"
 msgstr "PC-Name"
 
@@ -4765,7 +5074,7 @@ msgstr "PC-Name"
 msgid "PDF editor"
 msgstr "PDF-Editor"
 
-#: ../lib/lists.inc:623 ../help/help.inc:160
+#: ../lib/lists.inc:621 ../help/help.inc:160
 msgid "PDF structure"
 msgstr "PDF-Struktur"
 
@@ -4790,7 +5099,7 @@ msgstr ""
 "Pakete an den Default-Gateway gesendet. Dieser routet sie in das "
 "Zielnetzwerk."
 
-#: ../templates/selfService/adminMain.php:445 ../help/help.inc:180
+#: ../templates/selfService/adminMain.php:358 ../help/help.inc:180
 msgid "Page header"
 msgstr "Seitenkopf"
 
@@ -4812,13 +5121,13 @@ msgstr "Elter von"
 
 #: ../templates/lists/changePassword.php:272 ../templates/login.php:296
 #: ../templates/selfService/selfServiceLogin.php:226
-#: ../lib/modules/asteriskAccount.inc:95
-#: ../lib/modules/asteriskAccount.inc:154 ../lib/modules/posixGroup.inc:193
+#: ../lib/modules/asteriskAccount.inc:106
+#: ../lib/modules/asteriskAccount.inc:389 ../lib/modules/posixGroup.inc:193
 #: ../lib/modules/posixGroup.inc:473 ../lib/modules/sambaSamAccount.inc:400
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:78
-#: ../lib/modules/posixAccount.inc:143 ../lib/modules/posixAccount.inc:245
-#: ../lib/modules/posixAccount.inc:308 ../lib/modules/posixAccount.inc:370
-#: ../lib/modules/posixAccount.inc:992 ../lib/modules/posixAccount.inc:1159
+#: ../lib/modules/posixAccount.inc:79 ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:145 ../lib/modules/posixAccount.inc:248
+#: ../lib/modules/posixAccount.inc:311 ../lib/modules/posixAccount.inc:373
+#: ../lib/modules/posixAccount.inc:1003 ../lib/modules/posixAccount.inc:1170
 #: ../lib/modules/asteriskVoicemail.inc:90
 #: ../lib/modules/asteriskVoicemail.inc:156 ../lib/modules.inc:1333
 #: ../help/help.inc:158
@@ -4826,7 +5135,7 @@ msgid "Password"
 msgstr "Passwort"
 
 #: ../lib/modules/sambaSamAccount.inc:272
-#: ../lib/modules/sambaSamAccount.inc:1074
+#: ../lib/modules/sambaSamAccount.inc:1088
 msgid "Password change at next login"
 msgstr "Passwortänderung beim nächsten Login"
 
@@ -4842,7 +5151,7 @@ msgid "Password change requires old password"
 msgstr "Passwortänderung benötigt altes Passwort"
 
 #: ../lib/modules/posixGroup.inc:473 ../lib/modules/sambaSamAccount.inc:97
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:79
+#: ../lib/modules/posixAccount.inc:80 ../lib/modules/posixAccount.inc:81
 msgid ""
 "Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and #*,.;:_-+!%&/|?{[()]}=@$ !"
@@ -4853,15 +5162,15 @@ msgstr ""
 #: ../lib/modules/sambaSamAccount.inc:257
 #: ../lib/modules/sambaSamAccount.inc:260
 #: ../lib/modules/sambaSamAccount.inc:422
-#: ../lib/modules/sambaSamAccount.inc:1064
-#: ../lib/modules/sambaSamAccount.inc:1470
+#: ../lib/modules/sambaSamAccount.inc:1078
+#: ../lib/modules/sambaSamAccount.inc:1488
 msgid "Password does not expire"
 msgstr "Passwort läuft nicht ab"
 
 #: ../lib/modules/shadowAccount.inc:61 ../lib/modules/shadowAccount.inc:106
 #: ../lib/modules/shadowAccount.inc:163 ../lib/modules/shadowAccount.inc:172
-#: ../lib/modules/shadowAccount.inc:206 ../lib/modules/shadowAccount.inc:311
-#: ../lib/modules/shadowAccount.inc:454
+#: ../lib/modules/shadowAccount.inc:206 ../lib/modules/shadowAccount.inc:312
+#: ../lib/modules/shadowAccount.inc:466
 msgid "Password expiration"
 msgstr "Passwortablauf"
 
@@ -4874,9 +5183,9 @@ msgid "Password for voicemail mailbox."
 msgstr "Passwort für den Anrufbeantworter."
 
 #: ../lib/modules/posixGroup.inc:409 ../lib/modules/posixGroup.inc:437
-#: ../lib/modules/posixAccount.inc:147 ../lib/modules/posixAccount.inc:180
-#: ../lib/modules/posixAccount.inc:325 ../lib/modules/inetOrgPerson.inc:226
-#: ../lib/modules/inetOrgPerson.inc:587
+#: ../lib/modules/posixAccount.inc:149 ../lib/modules/posixAccount.inc:183
+#: ../lib/modules/posixAccount.inc:328 ../lib/modules/inetOrgPerson.inc:288
+#: ../lib/modules/inetOrgPerson.inc:649
 msgid "Password hash type"
 msgstr "Passwort-Hash"
 
@@ -4911,7 +5220,7 @@ msgstr "Maximales Passwortalter muss größer als minimales Passwortalter sein."
 msgid "Password minimum age must be are natural number."
 msgstr "Minimales Passwortalter muss eine natürliche Zahl sein."
 
-#: ../lib/modules/imapAccess.inc:81 ../lib/modules/imapAccess.inc:216
+#: ../lib/modules/imapAccess.inc:84 ../lib/modules/imapAccess.inc:261
 msgid "Password of IMAP admin user"
 msgstr "Passwort für den IMAP-Administrator"
 
@@ -4940,8 +5249,8 @@ msgstr "Passwortqualitätsprüfung"
 
 #: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:101
 #: ../lib/modules/shadowAccount.inc:161 ../lib/modules/shadowAccount.inc:168
-#: ../lib/modules/shadowAccount.inc:200 ../lib/modules/shadowAccount.inc:304
-#: ../lib/modules/shadowAccount.inc:453
+#: ../lib/modules/shadowAccount.inc:200 ../lib/modules/shadowAccount.inc:305
+#: ../lib/modules/shadowAccount.inc:465
 msgid "Password warning"
 msgstr "Passwortwarnung"
 
@@ -4949,7 +5258,7 @@ msgstr "Passwortwarnung"
 msgid "Password warning must be are natural number."
 msgstr "Passwortwarnung muss eine natürliche Zahl sein."
 
-#: ../templates/config/confmain.php:464 ../lib/modules.inc:1394
+#: ../templates/config/confmain.php:462 ../lib/modules.inc:1394
 msgid "Passwords are different!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
@@ -4982,20 +5291,38 @@ msgstr "Pfad zum Schlüssel für DNS-Änderungen"
 msgid "Permanently delete all children, too?"
 msgstr "Sollen auch alle Untereinträge gelöscht werden?"
 
+#: ../lib/modules/asteriskAccount.inc:162
+#: ../lib/modules/asteriskAccount.inc:271
+#: ../lib/modules/asteriskAccount.inc:343
+#: ../lib/modules/asteriskAccount.inc:486
+#: ../lib/modules/asteriskAccount.inc:809
+#: ../lib/modules/asteriskAccount.inc:1226
+msgid "Permit"
+msgstr "Erlauben"
+
 #: ../lib/modules/inetOrgPerson.inc:96
 msgid "Personal"
 msgstr "Persönlich"
 
 #: ../lib/types/user.inc:102 ../lib/types/user.inc:279
-#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:1580
-#: ../lib/modules/inetOrgPerson.inc:1587
+#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:1649
+#: ../lib/modules/inetOrgPerson.inc:1656
 msgid "Photo"
 msgstr "Foto"
 
-#: ../lib/modules/inetOrgPerson.inc:1002
+#: ../lib/modules/inetOrgPerson.inc:1071
 msgid "Photo file (JPG format)"
 msgstr "Fotodatei (JPG-Format)"
 
+#: ../lib/modules/asteriskAccount.inc:166
+#: ../lib/modules/asteriskAccount.inc:273
+#: ../lib/modules/asteriskAccount.inc:344
+#: ../lib/modules/asteriskAccount.inc:493
+#: ../lib/modules/asteriskAccount.inc:818
+#: ../lib/modules/asteriskAccount.inc:1229
+msgid "Pickup group"
+msgstr "Pickup-Gruppe"
+
 #: ../lib/modules/ldapPublicKey.inc:67
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "Bitte geben Sie eine Liste von SSH-Schlüsseln, getrennt durch Kommata, ein."
@@ -5012,10 +5339,18 @@ msgstr ""
 msgid "Please add at least one member."
 msgstr "Sie müssen mindestens ein Mitglied hinzufügen."
 
-#: ../lib/modules/sambaSamAccount.inc:1026
+#: ../lib/modules/sambaSamAccount.inc:1040
 msgid "Please check your settings on the Unix page!"
 msgstr "Bitte überprüfen Sie Ihre Eingaben auf der Unix-Seite!"
 
+#: ../lib/modules/imapAccess.inc:94
+msgid ""
+"Please choose the attribute to get the IMAP user name. The default is \"mail"
+"\" but you can also use \"uid\"."
+msgstr ""
+"Bitte wählen Sie das Attribut, das den IMAP-Benutzer definiert. Der Standard "
+"ist \"mail \" aber Sie können auch \"uid\" verwenden."
+
 #: ../lib/modules/phpGroupwareUser.inc:134
 msgid "Please enter \"active\" or \"inactive\"."
 msgstr "Bitte geben Sie \"active\" oder \"inactive\" ein."
@@ -5024,11 +5359,11 @@ msgstr "Bitte geben Sie \"active\" oder \"inactive\" ein."
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "Bitte geben Sie eine RID-Nummer oder den Namen eines Spezialaccounts ein!"
 
-#: ../lib/modules/asteriskAccount.inc:166
+#: ../lib/modules/asteriskAccount.inc:619
 msgid "Please enter a caller ID."
 msgstr "Bitte geben Sie eine Anrufer-ID ein."
 
-#: ../lib/modules/imapAccess.inc:88
+#: ../lib/modules/imapAccess.inc:91
 msgid ""
 "Please enter a comma separated list of domain names (e.g. \"company.com,"
 "example.com\"). LAM will only manage mailboxes from these domains."
@@ -5044,15 +5379,16 @@ msgstr "Bitte geben Sie eine Liste von Hostnamen, getrennt durch Kommata, ein!"
 msgid "Please enter a common name."
 msgstr "Bitte geben Sie einen Namen ein."
 
-#: ../lib/modules/imapAccess.inc:134
+#: ../lib/modules/imapAccess.inc:153
 msgid "Please enter a correct list of valid mail domains."
 msgstr "Bitte geben Sie eine gültige Liste von EMail-Domänen ein."
 
-#: ../lib/modules/nisObject.inc:55 ../lib/modules/sudoRole.inc:56
+#: ../lib/modules/nisObject.inc:55 ../lib/modules/automount.inc:55
+#: ../lib/modules/sudoRole.inc:56
 msgid "Please enter a descriptive name for this entry."
 msgstr "Hier können Sie eine Beschreibung für diesen Eintrag eintragen."
 
-#: ../lib/modules/groupOfNames.inc:123
+#: ../lib/modules/groupOfNames.inc:141
 msgid "Please enter a group name!"
 msgstr "Bitte geben Sie einen Gruppennamen ein!"
 
@@ -5115,7 +5451,7 @@ msgstr "Bitte geben Sie einen eindeutigen Namen für diese Passwortrichtlinie ei
 msgid "Please enter a user password."
 msgstr "Bitte geben Sie ein Passwort ein."
 
-#: ../lib/modules/eduPerson.inc:215 ../lib/modules/eduPerson.inc:217
+#: ../lib/modules/eduPerson.inc:217 ../lib/modules/eduPerson.inc:219
 msgid "Please enter a valid DN in the field:"
 msgstr "Bitte geben Sie einen gültigen DN ein. Feld:"
 
@@ -5123,7 +5459,7 @@ msgstr "Bitte geben Sie einen gültigen DN ein. Feld:"
 msgid "Please enter a valid business category!"
 msgstr "Bitte geben Sie eine gültige Abteilung ein!"
 
-#: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
+#: ../lib/modules/posixAccount.inc:99 ../lib/modules/posixAccount.inc:100
 #: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:72
 msgid "Please enter a valid common name!"
 msgstr "Bitte geben Sie einen gültigen allgemeinen Namen ein!"
@@ -5132,6 +5468,11 @@ msgstr "Bitte geben Sie einen gültigen allgemeinen Namen ein!"
 msgid "Please enter a valid date in format DD-MM-YYYY."
 msgstr "Bitte geben Sie ein gültiges Datum im Format TT-MM-JJJJ ein."
 
+#: ../lib/modules/asteriskAccount.inc:640
+#: ../lib/modules/asteriskAccount.inc:641
+msgid "Please enter a valid default user."
+msgstr "Bitte geben Sie einen gültigen Standardbenutzer ein."
+
 #: ../lib/modules/sambaSamAccount.inc:100
 #: ../lib/modules/sambaSamAccount.inc:101
 msgid "Please enter a valid display name!"
@@ -5158,7 +5499,7 @@ msgstr "Bitte geben Sie einen gültigen Angestelltentyp ein!"
 msgid "Please enter a valid fax number!"
 msgstr "Bitte geben Sie eine gültige Faxnummer ein!"
 
-#: ../lib/lists.inc:222
+#: ../lib/lists.inc:220
 msgid ""
 "Please enter a valid filter. Only letters, numbers and \" _*$.-\" are "
 "allowed."
@@ -5166,6 +5507,16 @@ msgstr ""
 "Bitte geben Sie einen gültigen Filter ein. Es sind Buchstaben, Zahlen und "
 "\"_*$.-\" erlaubt."
 
+#: ../lib/modules/asteriskAccount.inc:634
+#: ../lib/modules/asteriskAccount.inc:635
+msgid "Please enter a valid from domain."
+msgstr "Bitte geben Sie einen gültige Quelldomäne ein."
+
+#: ../lib/modules/asteriskAccount.inc:632
+#: ../lib/modules/asteriskAccount.inc:633
+msgid "Please enter a valid from user."
+msgstr "Bitte geben Sie einen gültigen Quellbenutzer ein."
+
 #: ../lib/modules/sambaSamAccount.inc:111
 msgid "Please enter a valid group name!"
 msgstr "Bitte geben Sie einen gültigen Gruppennamen ein!"
@@ -5174,7 +5525,7 @@ msgstr "Bitte geben Sie einen gültigen Gruppennamen ein!"
 msgid "Please enter a valid job title!"
 msgstr "Bitte geben Sie eine gültige Berufsbezeichnung ein!"
 
-#: ../lib/modules/eduPerson.inc:223
+#: ../lib/modules/eduPerson.inc:225
 msgid "Please enter a valid list of affiliations."
 msgstr "Bitte geben Sie eine gültige Liste von Zugehörigkeiten ein."
 
@@ -5190,8 +5541,10 @@ msgstr "Bitte geben Sie eine gültige Mobiltelefonnummer ein!"
 msgid "Please enter a valid path."
 msgstr "Bitte geben Sie einen gültigen Pfad ein."
 
-#: ../lib/modules/zarafaServer.inc:120 ../lib/modules/zarafaServer.inc:121
-#: ../lib/modules/zarafaServer.inc:122 ../lib/modules/zarafaServer.inc:123
+#: ../lib/modules/asteriskAccount.inc:636
+#: ../lib/modules/asteriskAccount.inc:637 ../lib/modules/zarafaServer.inc:120
+#: ../lib/modules/zarafaServer.inc:121 ../lib/modules/zarafaServer.inc:122
+#: ../lib/modules/zarafaServer.inc:123
 msgid "Please enter a valid port number."
 msgstr "Bitte geben Sie eine gültige Portnummer ein."
 
@@ -5203,15 +5556,15 @@ msgstr "Bitte geben Sie eine gültige Anschrift ein!"
 msgid "Please enter a valid postal code!"
 msgstr "Bitte geben Sie eine gültige Postleitzahl ein!"
 
-#: ../lib/modules/eduPerson.inc:221
+#: ../lib/modules/eduPerson.inc:223
 msgid "Please enter a valid primary affiliation."
 msgstr "Bitte geben Sie eine primäre Zugehörigkeit ein."
 
-#: ../lib/modules/eduPerson.inc:222
+#: ../lib/modules/eduPerson.inc:224
 msgid "Please enter a valid scoped affiliation."
 msgstr "Bitte geben Sie einen gültigen Zugehörigkeitsbereich ein."
 
-#: ../lib/modules/imapAccess.inc:133
+#: ../lib/modules/imapAccess.inc:152
 msgid "Please enter a valid server name where the mailboxes reside."
 msgstr "Bitte geben Sie einen korrekten Servernamen an auf dem die Postfächer liegen."
 
@@ -5224,12 +5577,12 @@ msgstr "Bitte geben Sie einen gültigen Straßennamen ein!"
 msgid "Please enter a valid telephone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein!"
 
-#: ../lib/modules/posixGroup.inc:575 ../lib/modules/posixAccount.inc:736
+#: ../lib/modules/posixGroup.inc:575 ../lib/modules/posixAccount.inc:754
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "Bitte geben Sie einen Wert zwischen %s und %s ein!"
 
-#: ../lib/modules/kolabUser.inc:270 ../lib/modules/imapAccess.inc:157
+#: ../lib/modules/kolabUser.inc:270 ../lib/modules/imapAccess.inc:179
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "Bitte geben Sie eine e-mail Adresse auf dieser Seite ein: %s"
@@ -5284,6 +5637,14 @@ msgstr "Bitte geben Sie den Accountkontext an."
 msgid "Please enter the account information on the other pages first."
 msgstr "Bitte geben Sie erst auf den anderen Seiten die Accountdaten ein."
 
+#: ../lib/modules/asteriskAccount.inc:629
+msgid "Please enter the account type."
+msgstr "Bitte geben Sie den Accounttyp an."
+
+#: ../lib/modules/asteriskAccount.inc:111
+msgid "Please enter the account's type (e.g. \"friend\")."
+msgstr "Bitte geben Sie den Accounttyp (z.B. \"friend\") an."
+
 #: ../lib/modules/asteriskExtension.inc:193
 msgid "Please enter the application data."
 msgstr "Bitte geben Sie die Applikationsdaten ein."
@@ -5292,6 +5653,12 @@ msgstr "Bitte geben Sie die Applikationsdaten ein."
 msgid "Please enter the application."
 msgstr "Bitte geben Sie die Applikation an."
 
+#: ../lib/modules/automount.inc:59
+msgid "Please enter the automount entry (e.g. \"-fstype=nfs,rw server:/home\")."
+msgstr ""
+"Bitte geben Sie den Automount-Eintrag (z.B. \"-fstype=nfs,rw server:/home\") "
+"ein."
+
 #: ../help/help.inc:53
 msgid ""
 "Please enter the configuration password. This is NOT your LDAP password. It "
@@ -5302,7 +5669,7 @@ msgstr ""
 "Passwort. Es befindet sich in ihrer .conf-Datei. Wenn Sie sich zum ersten "
 "Mal anmelden geben Sie \"lam\" ein."
 
-#: ../lib/modules/asteriskAccount.inc:170
+#: ../lib/modules/asteriskAccount.inc:623
 #: ../lib/modules/asteriskExtension.inc:194
 msgid "Please enter the extension context."
 msgstr "Bitte geben Sie den Erweiterungskontext an."
@@ -5311,7 +5678,7 @@ msgstr "Bitte geben Sie den Erweiterungskontext an."
 msgid "Please enter the extension name."
 msgstr "Bitte geben Sie den Erweiterungsnamen an."
 
-#: ../lib/modules/asteriskAccount.inc:173
+#: ../lib/modules/asteriskAccount.inc:626
 msgid "Please enter the host name."
 msgstr "Bitte geben Sie den Hostnamen an."
 
@@ -5371,7 +5738,7 @@ msgstr ""
 "Bitte geben Sie den neuen Namen des Profils an. Profilnamen dürfen "
 "Buchstaben, Zahlen und -/_ enthalten."
 
-#: ../lib/modules/asteriskAccount.inc:96 ../lib/modules/posixAccount.inc:371
+#: ../lib/modules/asteriskAccount.inc:107 ../lib/modules/posixAccount.inc:374
 msgid "Please enter the password which you want to set for this account."
 msgstr "Bitte geben Sie das Passwort für diesen Account ein."
 
@@ -5385,7 +5752,7 @@ msgstr ""
 "Zufallspasswort (12 Zeichen) erzeugen, das dann auf dem Bildschirm angezeigt "
 "wird."
 
-#: ../lib/modules/posixAccount.inc:342
+#: ../lib/modules/posixAccount.inc:345
 msgid "Please enter the path to the user's home directory."
 msgstr "Bitte geben Sie den Pfad zum Heimatverzeichnis des Benutzers an."
 
@@ -5401,6 +5768,10 @@ msgstr "Bitte geben Sie die Portnummer für verschlüsselte Verbindungen ein."
 msgid "Please enter the priority."
 msgstr "Bitte geben Sie die Priorität ein."
 
+#: ../lib/modules/imapAccess.inc:100
+msgid "Please enter the quota limit of this mailbox in kilobytes."
+msgstr "Bitte geben Sie das Quota-Limit des Postfaches in kB ein."
+
 #: ../lib/modules/quota.inc:146
 msgid ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
@@ -5411,7 +5782,7 @@ msgstr ""
 "{hartes Inode-Limit}"
 
 #: ../templates/lists/changePassword.php:349
-#: ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:79
 msgid "Please enter the same password in both password fields."
 msgstr "Bitte geben Sie das selbe Passwort in beide Felder ein."
 
@@ -5451,7 +5822,7 @@ msgstr ""
 msgid "Please provide a file to upload."
 msgstr "Bitte geben Sie eine Datei zum Hochladen an."
 
-#: ../lib/modules/inetOrgPerson.inc:548
+#: ../lib/modules/inetOrgPerson.inc:610
 msgid "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
 "Bitte wählen Sie ein Foto zum Hochladen. Es muss im JPG-Format (.jpg/.jpeg) "
@@ -5476,14 +5847,14 @@ msgstr ""
 msgid "Please set up all required attributes on page: %s"
 msgstr "Bitte setzen Sie alle erforderlichen Werte auf der Seite: %s"
 
-#: ../templates/config/profmanage.php:182
+#: ../templates/config/profmanage.php:186
 #: ../templates/selfService/profManage.php:144
 msgid "Please set up your master configuration file (config/config.cfg) first!"
 msgstr ""
 "Bitte konfigurieren Sie zuerst die Haupteinstellungsdatei (config/config."
 "cfg)!"
 
-#: ../lib/modules/dhcp_settings.inc:503 ../lib/modules/ddns.inc:336
+#: ../lib/modules/dhcp_settings.inc:507 ../lib/modules/ddns.inc:336
 msgid ""
 "Please set your LDAP suffix to an LDAP entry with object class \"dhcpServer"
 "\"."
@@ -5495,42 +5866,57 @@ msgstr ""
 msgid "Policy list has invalid format!"
 msgstr "Regelliste hat ungültiges Format!"
 
+#: ../lib/modules/asteriskAccount.inc:170
+#: ../lib/modules/asteriskAccount.inc:275
+#: ../lib/modules/asteriskAccount.inc:345
+#: ../lib/modules/asteriskAccount.inc:500
+#: ../lib/modules/asteriskAccount.inc:827
+#: ../lib/modules/asteriskAccount.inc:1232
+msgid "Port"
+msgstr "Port"
+
+#: ../lib/modules/asteriskAccount.inc:171
+msgid "Port number."
+msgstr "Portnummer."
+
 #: ../templates/pdfedit/pdfpage.php:539 ../templates/pdfedit/pdfpage.php:549
 #: ../templates/pdfedit/pdfpage.php:559 ../templates/pdfedit/pdfpage.php:574
 msgid "Position"
 msgstr "Position"
 
-#: ../templates/masscreate.php:270 ../lib/modules/customScripts.inc:112
-#: ../lib/modules/customScripts.inc:114 ../lib/modules/customScripts.inc:116
+#: ../templates/masscreate.php:276 ../templates/masscreate.php:351
+#: ../lib/modules/customScripts.inc:112 ../lib/modules/customScripts.inc:114
+#: ../lib/modules/customScripts.inc:116
 #: ../lib/modules/sambaGroupMapping.inc:442
 msgid "Possible values"
 msgstr "Mögliche Werte"
 
-#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:183
-#: ../lib/modules/inetOrgPerson.inc:314 ../lib/modules/inetOrgPerson.inc:419
-#: ../lib/modules/inetOrgPerson.inc:511 ../lib/modules/inetOrgPerson.inc:512
-#: ../lib/modules/inetOrgPerson.inc:854 ../lib/modules/inetOrgPerson.inc:1107
-#: ../lib/modules/inetOrgPerson.inc:1522
+#: ../lib/modules/inetOrgPerson.inc:122 ../lib/modules/inetOrgPerson.inc:132
+#: ../lib/modules/inetOrgPerson.inc:245 ../lib/modules/inetOrgPerson.inc:376
+#: ../lib/modules/inetOrgPerson.inc:481 ../lib/modules/inetOrgPerson.inc:573
+#: ../lib/modules/inetOrgPerson.inc:574 ../lib/modules/inetOrgPerson.inc:923
+#: ../lib/modules/inetOrgPerson.inc:1176 ../lib/modules/inetOrgPerson.inc:1591
 msgid "Post office box"
 msgstr "Postfach"
 
 #: ../lib/modules/inetOrgPerson.inc:63 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:191 ../lib/modules/inetOrgPerson.inc:306
-#: ../lib/modules/inetOrgPerson.inc:431 ../lib/modules/inetOrgPerson.inc:519
-#: ../lib/modules/inetOrgPerson.inc:874 ../lib/modules/inetOrgPerson.inc:1109
-#: ../lib/modules/inetOrgPerson.inc:1508
+#: ../lib/modules/inetOrgPerson.inc:144 ../lib/modules/inetOrgPerson.inc:253
+#: ../lib/modules/inetOrgPerson.inc:368 ../lib/modules/inetOrgPerson.inc:493
+#: ../lib/modules/inetOrgPerson.inc:581 ../lib/modules/inetOrgPerson.inc:943
+#: ../lib/modules/inetOrgPerson.inc:1178 ../lib/modules/inetOrgPerson.inc:1577
 msgid "Postal address"
 msgstr "Anschrift"
 
-#: ../lib/modules/inetOrgPerson.inc:520
+#: ../lib/modules/inetOrgPerson.inc:582
 msgid "Postal address, city"
 msgstr "Bitte geben Sie hier die Anschrift ein."
 
 #: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:122
-#: ../lib/modules/inetOrgPerson.inc:185 ../lib/modules/inetOrgPerson.inc:298
-#: ../lib/modules/inetOrgPerson.inc:422 ../lib/modules/inetOrgPerson.inc:515
-#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:859
-#: ../lib/modules/inetOrgPerson.inc:1108 ../lib/modules/inetOrgPerson.inc:1515
+#: ../lib/modules/inetOrgPerson.inc:135 ../lib/modules/inetOrgPerson.inc:247
+#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:484
+#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:578
+#: ../lib/modules/inetOrgPerson.inc:928 ../lib/modules/inetOrgPerson.inc:1177
+#: ../lib/modules/inetOrgPerson.inc:1584
 msgid "Postal code"
 msgstr "Postleitzahl"
 
@@ -5538,42 +5924,42 @@ msgstr "Postleitzahl"
 msgid "Predefined values"
 msgstr "Vordefinierte Werte"
 
-#: ../lib/modules/imapAccess.inc:84 ../lib/modules/imapAccess.inc:108
+#: ../lib/modules/imapAccess.inc:87 ../lib/modules/imapAccess.inc:117
 msgid "Prefix for mailboxes"
 msgstr "Präfix für Postfächer"
 
-#: ../lib/modules/inetOrgPerson.inc:260
+#: ../lib/modules/inetOrgPerson.inc:322
 msgid "President"
 msgstr "Präsident"
 
-#: ../lib/modules/eduPerson.inc:78 ../lib/modules/eduPerson.inc:145
-#: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:245
-#: ../lib/modules/eduPerson.inc:649
+#: ../lib/modules/eduPerson.inc:80 ../lib/modules/eduPerson.inc:147
+#: ../lib/modules/eduPerson.inc:202 ../lib/modules/eduPerson.inc:259
+#: ../lib/modules/eduPerson.inc:663
 msgid "Primary affiliation"
 msgstr "Primäre Zugehörigkeit"
 
-#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixAccount.inc:210
-#: ../lib/modules/posixAccount.inc:284 ../lib/modules/posixAccount.inc:303
-#: ../lib/modules/posixAccount.inc:333 ../lib/modules/posixAccount.inc:362
-#: ../lib/modules/posixAccount.inc:400 ../lib/modules/posixAccount.inc:955
-#: ../lib/modules/posixAccount.inc:1082 ../lib/modules/posixAccount.inc:1105
-#: ../lib/modules/posixAccount.inc:1153
+#: ../lib/modules/posixGroup.inc:487 ../lib/modules/posixAccount.inc:213
+#: ../lib/modules/posixAccount.inc:287 ../lib/modules/posixAccount.inc:306
+#: ../lib/modules/posixAccount.inc:336 ../lib/modules/posixAccount.inc:365
+#: ../lib/modules/posixAccount.inc:403 ../lib/modules/posixAccount.inc:966
+#: ../lib/modules/posixAccount.inc:1093 ../lib/modules/posixAccount.inc:1116
+#: ../lib/modules/posixAccount.inc:1164
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
-#: ../lib/modules/eduPerson.inc:115 ../lib/modules/eduPerson.inc:183
-#: ../lib/modules/eduPerson.inc:203 ../lib/modules/eduPerson.inc:217
-#: ../lib/modules/eduPerson.inc:347 ../lib/modules/eduPerson.inc:673
+#: ../lib/modules/eduPerson.inc:117 ../lib/modules/eduPerson.inc:185
+#: ../lib/modules/eduPerson.inc:205 ../lib/modules/eduPerson.inc:219
+#: ../lib/modules/eduPerson.inc:361 ../lib/modules/eduPerson.inc:687
 msgid "Primary organizational unit"
 msgstr "Primäre organisatorische Einheit"
 
-#: ../lib/modules/eduPerson.inc:99 ../lib/modules/eduPerson.inc:138
-#: ../lib/modules/eduPerson.inc:201 ../lib/modules/eduPerson.inc:239
-#: ../lib/modules/eduPerson.inc:655
+#: ../lib/modules/eduPerson.inc:101 ../lib/modules/eduPerson.inc:140
+#: ../lib/modules/eduPerson.inc:203 ../lib/modules/eduPerson.inc:253
+#: ../lib/modules/eduPerson.inc:669
 msgid "Principal name"
 msgstr "Benutzername"
 
-#: ../lib/modules/eduPerson.inc:213 ../lib/modules/eduPerson.inc:214
+#: ../lib/modules/eduPerson.inc:215 ../lib/modules/eduPerson.inc:216
 msgid "Principal name is invalid!"
 msgstr "Der Benutzername ist ungültig!"
 
@@ -5586,11 +5972,11 @@ msgstr "Der Benutzername ist ungültig!"
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../lib/modules/inetOrgPerson.inc:552
+#: ../lib/modules/inetOrgPerson.inc:614
 msgid "Private telephone number"
 msgstr "Private Telefonnummer"
 
-#: ../templates/config/profmanage.php:144
+#: ../templates/config/profmanage.php:148
 #: ../templates/selfService/profManage.php:127
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
@@ -5601,7 +5987,7 @@ msgid "Profile editor"
 msgstr "Profileditor"
 
 #: ../templates/config/profmanage.php:52
-#: ../templates/config/profmanage.php:195
+#: ../templates/config/profmanage.php:199
 #: ../templates/selfService/profManage.php:38
 #: ../templates/selfService/profManage.php:157 ../help/help.inc:116
 #: ../help/help.inc:118 ../help/help.inc:120 ../help/help.inc:122
@@ -5609,8 +5995,8 @@ msgstr "Profileditor"
 msgid "Profile management"
 msgstr "Profilverwaltung"
 
-#: ../templates/config/profmanage.php:210
-#: ../templates/config/profmanage.php:259
+#: ../templates/config/profmanage.php:214
+#: ../templates/config/profmanage.php:263
 #: ../templates/selfService/profManage.php:172
 #: ../templates/selfService/profManage.php:225
 #: ../templates/profedit/profiledelete.php:85
@@ -5619,19 +6005,19 @@ msgid "Profile name"
 msgstr "Profilname"
 
 #: ../templates/config/profmanage.php:128
-#: ../templates/config/profmanage.php:139
+#: ../templates/config/profmanage.php:143
 #: ../templates/selfService/profManage.php:103
 #: ../templates/selfService/profManage.php:118
 msgid "Profile name is invalid!"
 msgstr "Profilname ist ungültig!"
 
-#: ../templates/config/profmanage.php:223
-#: ../templates/config/profmanage.php:317
+#: ../templates/config/profmanage.php:227
+#: ../templates/config/profmanage.php:321
 msgid "Profile password"
 msgstr "Profilpasswort"
 
 #: ../templates/config/profmanage.php:126
-#: ../templates/config/profmanage.php:157
+#: ../templates/config/profmanage.php:161
 msgid "Profile passwords are different or empty!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
@@ -5641,12 +6027,12 @@ msgstr "Die Passwörter stimmen nicht überein!"
 #: ../lib/modules/sambaSamAccount.inc:286
 #: ../lib/modules/sambaSamAccount.inc:335
 #: ../lib/modules/sambaSamAccount.inc:477
-#: ../lib/modules/sambaSamAccount.inc:568
-#: ../lib/modules/sambaSamAccount.inc:1127
-#: ../lib/modules/sambaSamAccount.inc:1396
-#: ../lib/modules/sambaSamAccount.inc:1491
-#: ../lib/modules/sambaSamAccount.inc:1645
-#: ../lib/modules/sambaSamAccount.inc:1667
+#: ../lib/modules/sambaSamAccount.inc:573
+#: ../lib/modules/sambaSamAccount.inc:1141
+#: ../lib/modules/sambaSamAccount.inc:1414
+#: ../lib/modules/sambaSamAccount.inc:1509
+#: ../lib/modules/sambaSamAccount.inc:1663
+#: ../lib/modules/sambaSamAccount.inc:1685
 msgid "Profile path"
 msgstr "Profilpfad"
 
@@ -5664,8 +6050,18 @@ msgstr "Profil wurde gespeichert."
 msgid "Public store"
 msgstr "Öffentlicher Speicher"
 
+#: ../lib/modules/asteriskAccount.inc:174
+#: ../lib/modules/asteriskAccount.inc:277
+#: ../lib/modules/asteriskAccount.inc:346
+#: ../lib/modules/asteriskAccount.inc:507
+#: ../lib/modules/asteriskAccount.inc:836
+#: ../lib/modules/asteriskAccount.inc:1235
+msgid "Qualify"
+msgstr "Verbindungsprüfung"
+
 #: ../lib/modules/quota.inc:79 ../lib/modules/quota.inc:92
 #: ../lib/modules/quota.inc:145 ../lib/modules/zarafaUser.inc:416
+#: ../lib/modules/imapAccess.inc:99 ../lib/modules/imapAccess.inc:139
 msgid "Quota"
 msgstr "Quota"
 
@@ -5685,6 +6081,10 @@ msgstr "Hartes Quotalimit"
 msgid "Quota has wrong format!"
 msgstr "Quota haben falsches Format!"
 
+#: ../lib/modules/imapAccess.inc:289 ../lib/modules/imapAccess.inc:298
+msgid "Quota limit (kB)"
+msgstr "Quotalimit (kB)"
+
 #: ../lib/modules/zarafaUser.inc:72 ../lib/modules/zarafaUser.inc:146
 #: ../lib/modules/zarafaUser.inc:193 ../lib/modules/zarafaUser.inc:308
 #: ../lib/modules/zarafaUser.inc:423 ../lib/modules/zarafaUser.inc:1038
@@ -5710,7 +6110,7 @@ msgstr "Quotawarnlimit"
 msgid "RDN"
 msgstr "RDN"
 
-#: ../templates/masscreate.php:298 ../templates/profedit/profilepage.php:200
+#: ../templates/masscreate.php:300 ../templates/profedit/profilepage.php:200
 #: ../lib/modules.inc:1275 ../help/help.inc:146
 msgid "RDN identifier"
 msgstr "RDN-Bezeichner"
@@ -5729,6 +6129,24 @@ msgstr "RID-Basis"
 msgid "RID settings"
 msgstr "RID-Einstellungen"
 
+#: ../lib/modules/asteriskAccount.inc:186
+#: ../lib/modules/asteriskAccount.inc:283
+#: ../lib/modules/asteriskAccount.inc:349
+#: ../lib/modules/asteriskAccount.inc:529
+#: ../lib/modules/asteriskAccount.inc:863
+#: ../lib/modules/asteriskAccount.inc:1244
+msgid "RTP hold timeout"
+msgstr "RTP-Halte-Timeout"
+
+#: ../lib/modules/asteriskAccount.inc:182
+#: ../lib/modules/asteriskAccount.inc:281
+#: ../lib/modules/asteriskAccount.inc:348
+#: ../lib/modules/asteriskAccount.inc:522
+#: ../lib/modules/asteriskAccount.inc:854
+#: ../lib/modules/asteriskAccount.inc:1241
+msgid "RTP timeout"
+msgstr "RTP-Timeout"
+
 #: ../lib/modules/range.inc:85 ../lib/modules/range.inc:418
 msgid "Range from"
 msgstr "Bereich von"
@@ -5738,7 +6156,7 @@ msgid "Range to"
 msgstr "Bereich bis"
 
 #: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:67
-#: ../lib/modules/range.inc:99 ../lib/modules/range.inc:482
+#: ../lib/modules/range.inc:99 ../lib/modules/range.inc:485
 msgid "Ranges"
 msgstr "Bereiche"
 
@@ -5758,7 +6176,7 @@ msgstr "Soll diese neue OU erstellt werden?"
 msgid "Really delete attribute?"
 msgstr "Dieses Attribut wirklich löschen?"
 
-#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:151
+#: ../lib/modules/nisMailAlias.inc:71 ../lib/modules/nisMailAlias.inc:154
 msgid "Recipient"
 msgstr "Empfänger"
 
@@ -5768,14 +6186,14 @@ msgstr "Empfänger ist ungültig!"
 
 #: ../lib/types/mailAlias.inc:92 ../lib/modules/nisMailAlias.inc:75
 #: ../lib/modules/nisMailAlias.inc:89 ../lib/modules/nisMailAlias.inc:97
-#: ../lib/modules/nisMailAlias.inc:286
+#: ../lib/modules/nisMailAlias.inc:289
 msgid "Recipient list"
 msgstr "Empfängerliste"
 
 #: ../lib/modules/sambaSamAccount.inc:226
 #: ../lib/modules/sambaSamAccount.inc:365
-#: ../lib/modules/sambaSamAccount.inc:1439
-#: ../lib/modules/sambaSamAccount.inc:1719
+#: ../lib/modules/sambaSamAccount.inc:1457
+#: ../lib/modules/sambaSamAccount.inc:1737
 msgid "Reconnect if disconnected"
 msgstr "Wiederherstellen falls unterbrochen"
 
@@ -5787,21 +6205,48 @@ msgstr "Fortschritt des Löschvorgangs"
 msgid "Reenter new master password"
 msgstr "Neues Hauptpasswort erneut eingeben"
 
-#: ../templates/config/confmain.php:356 ../lib/modules/posixAccount.inc:1691
+#: ../templates/config/confmain.php:356 ../lib/modules/posixAccount.inc:1702
 msgid "Reenter password"
 msgstr "Passwort nochmal eingeben"
 
-#: ../templates/config/profmanage.php:232
-#: ../templates/config/profmanage.php:330
+#: ../templates/config/profmanage.php:236
+#: ../templates/config/profmanage.php:334
 msgid "Reenter profile password"
 msgstr "Profilpasswort erneut eingeben"
 
 #: ../templates/tree/edit.php:98 ../lib/tree.inc:88 ../lib/tree.inc:89
 #: ../lib/types/dhcp.inc:279 ../lib/modules/asteriskExtension.inc:301
-#: ../lib/lists.inc:717
+#: ../lib/lists.inc:715
 msgid "Refresh"
 msgstr "Aktualisieren"
 
+#: ../lib/modules/asteriskAccount.inc:206
+#: ../lib/modules/asteriskAccount.inc:293
+#: ../lib/modules/asteriskAccount.inc:354
+#: ../lib/modules/asteriskAccount.inc:565
+#: ../lib/modules/asteriskAccount.inc:908
+#: ../lib/modules/asteriskAccount.inc:1259
+msgid "Registration context"
+msgstr "Registrierungskontext"
+
+#: ../lib/modules/asteriskAccount.inc:210
+#: ../lib/modules/asteriskAccount.inc:295
+#: ../lib/modules/asteriskAccount.inc:355
+#: ../lib/modules/asteriskAccount.inc:572
+#: ../lib/modules/asteriskAccount.inc:917
+#: ../lib/modules/asteriskAccount.inc:1262
+msgid "Registration extension"
+msgstr "Registrierungserweiterung"
+
+#: ../lib/modules/asteriskAccount.inc:226
+#: ../lib/modules/asteriskAccount.inc:303
+#: ../lib/modules/asteriskAccount.inc:359
+#: ../lib/modules/asteriskAccount.inc:601
+#: ../lib/modules/asteriskAccount.inc:957
+#: ../lib/modules/asteriskAccount.inc:1274
+msgid "Registration server"
+msgstr "Registrierungsserver"
+
 #: ../lib/modules/kolabUser.inc:53
 msgid "Reject if conflicts"
 msgstr "Ablehnen bei Konflikten"
@@ -5812,12 +6257,12 @@ msgstr "Relativer eindeutiger Name"
 
 #: ../templates/config/confmodules.php:291
 #: ../templates/pdfedit/pdfpage.php:461
-#: ../lib/modules/sambaSamAccount.inc:1364 ../lib/modules/kolabUser.inc:895
+#: ../lib/modules/sambaSamAccount.inc:1382 ../lib/modules/kolabUser.inc:896
 #: ../lib/modules/phpGroupwareUser.inc:259
-#: ../lib/modules/shadowAccount.inc:414 ../lib/modules/sudoRole.inc:266
+#: ../lib/modules/shadowAccount.inc:426 ../lib/modules/sudoRole.inc:266
 #: ../lib/modules/sudoRole.inc:293 ../lib/modules/sudoRole.inc:320
 #: ../lib/modules/sudoRole.inc:347 ../lib/modules/sudoRole.inc:374
-#: ../lib/modules/sudoRole.inc:401 ../lib/modules/groupOfNames.inc:160
+#: ../lib/modules/sudoRole.inc:401 ../lib/modules/groupOfNames.inc:180
 msgid "Remove"
 msgstr "Löschen"
 
@@ -5825,7 +6270,7 @@ msgstr "Löschen"
 msgid "Remove Asterisk voicemail extension"
 msgstr "Asterisk Anrufbeantworter-Erweiterung entfernen"
 
-#: ../lib/modules/eduPerson.inc:379
+#: ../lib/modules/eduPerson.inc:393
 msgid "Remove EDU person extension"
 msgstr "EDU-Person-Erweiterung entfernen"
 
@@ -5833,11 +6278,11 @@ msgstr "EDU-Person-Erweiterung entfernen"
 msgid "Remove IP address extension"
 msgstr "IP-Adressen-Erweiterung entfernen"
 
-#: ../lib/modules/sambaSamAccount.inc:1204
+#: ../lib/modules/sambaSamAccount.inc:1218
 msgid "Remove Samba 3 extension"
 msgstr "Samba 3-Erweiterung entfernen"
 
-#: ../lib/modules/shadowAccount.inc:359
+#: ../lib/modules/shadowAccount.inc:360
 msgid "Remove Shadow account extension"
 msgstr "Shadow-Erweiterung entfernen"
 
@@ -5846,11 +6291,11 @@ msgstr "Shadow-Erweiterung entfernen"
 msgid "Remove Zarafa extension"
 msgstr "Zarafa-Erweiterung entfernen"
 
-#: ../lib/modules/hostObject.inc:156
+#: ../lib/modules/hostObject.inc:157
 msgid "Remove host extension"
 msgstr "Host-Erweiterung entfernen"
 
-#: ../lib/modules/posixGroup.inc:201 ../lib/modules/posixAccount.inc:1000
+#: ../lib/modules/posixGroup.inc:201 ../lib/modules/posixAccount.inc:1011
 msgid "Remove password"
 msgstr "Passwort entfernen"
 
@@ -5859,7 +6304,7 @@ msgstr "Passwort entfernen"
 msgid "Remove phpGroupWare extension"
 msgstr "phpGroupWare-Erweiterung entfernen"
 
-#: ../lib/modules/zarafaUser.inc:756 ../lib/modules/groupOfNames.inc:338
+#: ../lib/modules/zarafaUser.inc:756 ../lib/modules/groupOfNames.inc:359
 msgid "Remove selected entries"
 msgstr "Ausgewählte Einträge entfernen"
 
@@ -5867,16 +6312,16 @@ msgstr "Ausgewählte Einträge entfernen"
 msgid "Remove this account type"
 msgstr "Diesen Accounttyp entfernen"
 
-#: ../lib/modules/inetOrgPerson.inc:1577
+#: ../lib/modules/inetOrgPerson.inc:1646
 msgid "Remove/replace photo"
 msgstr "Foto ersetzen/entfernen"
 
-#: ../templates/config/profmanage.php:255
+#: ../templates/config/profmanage.php:259
 #: ../templates/selfService/profManage.php:221 ../help/help.inc:118
 msgid "Rename profile"
 msgstr "Profil umbenennen"
 
-#: ../templates/config/profmanage.php:135
+#: ../templates/config/profmanage.php:134
 #: ../templates/selfService/profManage.php:114
 msgid "Renamed profile."
 msgstr "Profil umbenannt."
@@ -5885,7 +6330,7 @@ msgstr "Profil umbenannt."
 msgid "Repeat password"
 msgstr "Passwort wiederholen"
 
-#: ../lib/modules/posixAccount.inc:69 ../lib/modules/posixAccount.inc:756
+#: ../lib/modules/posixAccount.inc:71 ../lib/modules/posixAccount.inc:774
 msgid "Replaced $user or $group in homedir."
 msgstr "$user und $group wurden im Heimatverzeichnis ersetzt."
 
@@ -5905,7 +6350,7 @@ msgstr "Erforderliches Attribut für Objektklasse(n) %s"
 msgid "Required attributes"
 msgstr "Vorgeschriebene Attribute"
 
-#: ../lib/modules/sambaSamAccount.inc:1198
+#: ../lib/modules/sambaSamAccount.inc:1212
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -5914,7 +6359,7 @@ msgid "Reset changes"
 msgstr "Änderungen zurücksetzen"
 
 #: ../lib/modules/sambaSamAccount.inc:242
-#: ../lib/modules/sambaSamAccount.inc:1197
+#: ../lib/modules/sambaSamAccount.inc:1211
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -5932,6 +6377,15 @@ msgstr "Rücksetzzeit muss eine natürliche Zahl sein."
 msgid "Resource settings"
 msgstr "Ressourceneinstellungen"
 
+#: ../lib/modules/asteriskAccount.inc:178
+#: ../lib/modules/asteriskAccount.inc:279
+#: ../lib/modules/asteriskAccount.inc:347
+#: ../lib/modules/asteriskAccount.inc:514
+#: ../lib/modules/asteriskAccount.inc:845
+#: ../lib/modules/asteriskAccount.inc:1238
+msgid "Restrict caller ID"
+msgstr "Anrufer-ID ausblenden"
+
 #: ../lib/modules/ddns.inc:106 ../lib/modules/ddns.inc:113
 #: ../lib/modules/ddns.inc:134 ../lib/modules/ddns.inc:374
 #: ../lib/modules/ddns.inc:401
@@ -5952,10 +6406,10 @@ msgstr "Rollenname"
 msgid "Room"
 msgstr "Raum"
 
-#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:195
-#: ../lib/modules/inetOrgPerson.inc:362 ../lib/modules/inetOrgPerson.inc:437
-#: ../lib/modules/inetOrgPerson.inc:555 ../lib/modules/inetOrgPerson.inc:884
-#: ../lib/modules/inetOrgPerson.inc:1116 ../lib/modules/inetOrgPerson.inc:1529
+#: ../lib/modules/inetOrgPerson.inc:123 ../lib/modules/inetOrgPerson.inc:257
+#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/inetOrgPerson.inc:499
+#: ../lib/modules/inetOrgPerson.inc:617 ../lib/modules/inetOrgPerson.inc:953
+#: ../lib/modules/inetOrgPerson.inc:1185 ../lib/modules/inetOrgPerson.inc:1598
 msgid "Room number"
 msgstr "Raumnummer"
 
@@ -5993,6 +6447,14 @@ msgstr "Ausführbenutzer"
 msgid "SASL mechanisms"
 msgstr "SASL-Mechanismen"
 
+#: ../lib/modules/asteriskAccount.inc:143
+msgid "SIP URI for a realtime peer."
+msgstr "SIP-URI für einen Echtzeitteilnehmer."
+
+#: ../lib/modules/asteriskAccount.inc:119
+msgid "SIP user agent identification."
+msgstr "SIP-Benutzeragentenidentifizierung."
+
 #: ../templates/tests/lamdaemonTest.php:235
 msgid "SSH connection"
 msgstr "SSH-Verbindung"
@@ -6074,23 +6536,23 @@ msgstr "Samba-Passwort"
 #: ../lib/modules/sambaSamAccount.inc:292
 #: ../lib/modules/sambaSamAccount.inc:295
 #: ../lib/modules/sambaSamAccount.inc:493
-#: ../lib/modules/sambaSamAccount.inc:571
-#: ../lib/modules/sambaSamAccount.inc:1138
-#: ../lib/modules/sambaSamAccount.inc:1499
-#: ../lib/modules/sambaSamAccount.inc:1648
+#: ../lib/modules/sambaSamAccount.inc:577
+#: ../lib/modules/sambaSamAccount.inc:1152
+#: ../lib/modules/sambaSamAccount.inc:1517
+#: ../lib/modules/sambaSamAccount.inc:1666
 msgid "Samba workstations"
 msgstr "Samba PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:1274
+#: ../lib/modules/sambaSamAccount.inc:1288
 msgid "Saturday"
 msgstr "Samstag"
 
 #: ../templates/tree/edit.php:512 ../templates/config/confmodules.php:215
-#: ../templates/config/confmain.php:372
+#: ../templates/config/confmain.php:370
 #: ../templates/config/moduleSettings.php:226
 #: ../templates/config/conftypes.php:277
-#: ../templates/selfService/selfServiceMain.php:333
-#: ../templates/selfService/adminMain.php:300
+#: ../templates/selfService/selfServiceMain.php:355
+#: ../templates/selfService/adminMain.php:476
 #: ../templates/pdfedit/pdfpage.php:583
 #: ../templates/profedit/profilepage.php:225 ../lib/modules.inc:1428
 msgid "Save"
@@ -6113,9 +6575,9 @@ msgstr "Suffix des Schemas"
 msgid "Schema test"
 msgstr "Schema-Test"
 
-#: ../lib/modules/eduPerson.inc:82 ../lib/modules/eduPerson.inc:152
-#: ../lib/modules/eduPerson.inc:204 ../lib/modules/eduPerson.inc:254
-#: ../lib/modules/eduPerson.inc:652
+#: ../lib/modules/eduPerson.inc:84 ../lib/modules/eduPerson.inc:154
+#: ../lib/modules/eduPerson.inc:206 ../lib/modules/eduPerson.inc:268
+#: ../lib/modules/eduPerson.inc:666
 msgid "Scoped affiliation"
 msgstr "Zugehörigkeitsbereich"
 
@@ -6123,15 +6585,15 @@ msgstr "Zugehörigkeitsbereich"
 msgid "Script path"
 msgstr "Scriptpfad"
 
-#: ../templates/config/confmain.php:440
+#: ../templates/config/confmain.php:438
 msgid "Script path is invalid!"
 msgstr "Scriptpfad ist ungültig!"
 
-#: ../templates/config/confmain.php:459
+#: ../templates/config/confmain.php:457
 msgid "Script rights are invalid!"
 msgstr "Skriptrechte sind ungültig!"
 
-#: ../templates/config/confmain.php:443
+#: ../templates/config/confmain.php:441
 msgid "Script server is invalid!"
 msgstr "Scriptserver ist ungültig!"
 
@@ -6179,19 +6641,19 @@ msgstr "Bitte lesen Sie das Handbuch um dieses Problem zu lösen."
 msgid "Select a template for the creation process"
 msgstr "Wählen Sie eine Vorlage für den Anlegevorgang"
 
-#: ../lib/lists.inc:406
+#: ../lib/lists.inc:404
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: ../lib/modules/nisnetgroup.inc:229 ../lib/modules/nisnetgroup.inc:258
+#: ../lib/modules/nisnetgroup.inc:230 ../lib/modules/nisnetgroup.inc:259
 msgid "Select host"
 msgstr "Host wählen"
 
-#: ../lib/modules/nisnetgroup.inc:235 ../lib/modules/nisnetgroup.inc:264
+#: ../lib/modules/nisnetgroup.inc:236 ../lib/modules/nisnetgroup.inc:265
 msgid "Select user"
 msgstr "Benutzer wählen"
 
-#: ../lib/modules/posixAccount.inc:1042 ../lib/modules/nisnetgroup.inc:373
+#: ../lib/modules/posixAccount.inc:1053 ../lib/modules/nisnetgroup.inc:374
 msgid "Selected groups"
 msgstr "Gewählte Gruppen"
 
@@ -6211,7 +6673,7 @@ msgstr "SelfService-Einstellungen"
 msgid "Self service configuration editor"
 msgstr "SelfService-Einstellungsassistent"
 
-#: ../templates/selfService/adminMain.php:296
+#: ../templates/selfService/adminMain.php:318
 msgid "Self service login"
 msgstr "SelfService-Login"
 
@@ -6222,7 +6684,7 @@ msgstr "Per mail senden"
 
 #: ../lib/modules/device.inc:58 ../lib/modules/device.inc:85
 #: ../lib/modules/device.inc:110 ../lib/modules/device.inc:165
-#: ../lib/modules/device.inc:388
+#: ../lib/modules/device.inc:389
 msgid "Serial number"
 msgstr "Seriennummer"
 
@@ -6231,12 +6693,12 @@ msgid "Server"
 msgstr "Server"
 
 #: ../templates/config/confmain.php:221
-#: ../templates/selfService/adminMain.php:331 ../lib/modules/imapAccess.inc:66
-#: ../lib/modules/imapAccess.inc:95 ../help/help.inc:54
+#: ../templates/selfService/adminMain.php:327 ../lib/modules/imapAccess.inc:69
+#: ../lib/modules/imapAccess.inc:104 ../help/help.inc:54
 msgid "Server address"
 msgstr "Serveraddresse"
 
-#: ../templates/config/confmain.php:405
+#: ../templates/config/confmain.php:403
 #: ../templates/selfService/adminMain.php:95
 msgid "Server address is invalid!"
 msgstr "Die Server-Adresse ist ungültig!"
@@ -6254,7 +6716,7 @@ msgid "Server profile"
 msgstr "Serverprofil"
 
 #: ../templates/config/confmain.php:250
-#: ../templates/selfService/adminMain.php:328
+#: ../templates/selfService/adminMain.php:343
 msgid "Server settings"
 msgstr "Servereinstellungen"
 
@@ -6266,15 +6728,23 @@ msgstr "Zeitbeschränkung für Sitzung"
 msgid "Set"
 msgstr "Setzen"
 
+#: ../lib/modules/shadowAccount.inc:420
+msgid "Set also for Samba 3"
+msgstr "Auch für Samba 3 setzen"
+
+#: ../lib/modules/sambaSamAccount.inc:1376
+msgid "Set also for Shadow"
+msgstr "Auch für Shadow setzen"
+
 #: ../lib/modules.inc:1321 ../lib/modules.inc:1435
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: ../lib/modules/posixAccount.inc:181 ../lib/modules/posixAccount.inc:313
+#: ../lib/modules/posixAccount.inc:184 ../lib/modules/posixAccount.inc:316
 msgid "Set primary group as memberUid"
 msgstr "Setze primäre Gruppe als memberUid"
 
-#: ../templates/config/profmanage.php:313 ../help/help.inc:122
+#: ../templates/config/profmanage.php:317 ../help/help.inc:122
 msgid "Set profile password"
 msgstr "Profilpasswort setzen"
 
@@ -6286,6 +6756,14 @@ msgstr "Zufälliges Passwort setzen"
 msgid "Set specific password"
 msgstr "Eigenes Passwort setzen"
 
+#: ../lib/modules/groupOfNames.inc:81
+msgid ""
+"Set this only if your LDAP schema allows that groups may not have any "
+"members (e.g. if you use OpenDJ)."
+msgstr ""
+"Aktivieren Sie diese Option nur wenn Ihr LDAP-Schema Gruppen ohne Mitglieder "
+"erlaubt (z.B. bei OpenDJ)."
+
 #: ../lib/modules/posixGroup.inc:402
 msgid "Sets the group password."
 msgstr "Setzt das Gruppenpasswort."
@@ -6296,8 +6774,8 @@ msgstr "Shadow"
 
 #: ../lib/modules/sambaSamAccount.inc:224
 #: ../lib/modules/sambaSamAccount.inc:359
-#: ../lib/modules/sambaSamAccount.inc:1423
-#: ../lib/modules/sambaSamAccount.inc:1703
+#: ../lib/modules/sambaSamAccount.inc:1441
+#: ../lib/modules/sambaSamAccount.inc:1721
 msgid "Shadowing"
 msgstr "Spiegeln"
 
@@ -6361,7 +6839,7 @@ msgstr "Weiches Inode-Limit (Dateien)."
 msgid "Soft inode limit"
 msgstr "Weiches Inode-Limit"
 
-#: ../lib/modules/imapAccess.inc:85
+#: ../lib/modules/imapAccess.inc:88
 msgid ""
 "Some IMAP servers store mailboxes with a prefix (e.g. \"user\" for Cyrus "
 "which results in \"user.username\")."
@@ -6393,10 +6871,14 @@ msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "Diese Hilfenummer ist leider nicht verfügbar: {bold}%d{endbold}"
 
 #: ../lib/modules/sambaSamAccount.inc:304
-#: ../lib/modules/sambaSamAccount.inc:1175
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Special user"
 msgstr "Spezieller Benutzer"
 
+#: ../lib/modules/asteriskAccount.inc:215
+msgid "Specifies if the user can call forward."
+msgstr "Legt fest, ob dieser Benutzer weiterleiten darf."
+
 #: ../lib/modules/zarafaGroup.inc:72
 msgid "Specifies if this group has security possibilities."
 msgstr "Legt fest, dass diese Gruppe Sicherheitseinstellungen hat."
@@ -6417,7 +6899,9 @@ msgstr "Legt fest, ob Benutzer ihre eigenen Passwörter ändern dürfen."
 msgid ""
 "Specifies the attribute that should be used to reference the entries. If you "
 "would like to reference also groups then this must be set to \"dn\"."
-msgstr "Hiermit legen Sie fest mit welchem Attribut Einträge referenziert werden. Falls Sie auch Gruppen referenzieren möchten dann wählen Sie bitte \"dn\"."
+msgstr ""
+"Hiermit legen Sie fest mit welchem Attribut Einträge referenziert werden. "
+"Falls Sie auch Gruppen referenzieren möchten dann wählen Sie bitte \"dn\"."
 
 #: ../lib/modules/zarafaUser.inc:105
 msgid "Specifies the capacity of this resource."
@@ -6472,7 +6956,7 @@ msgstr ""
 "Legt die Dauer in Sekunden fest, für die ein Passwort aufgrund zu vieler "
 "fehlerhafter Anmeldeversuche gesperrt wird."
 
-#: ../lib/modules/eduPerson.inc:83
+#: ../lib/modules/eduPerson.inc:85
 msgid ""
 "Specifies the person's affiliation within a particular security domain in "
 "broad categories such as student, faculty, staff, alum, etc."
@@ -6480,7 +6964,7 @@ msgstr ""
 "Dies legt in groben Kategorien die Zugehörigkeit der Person zu einer "
 "Sicherheitsdomäne fest."
 
-#: ../lib/modules/eduPerson.inc:79
+#: ../lib/modules/eduPerson.inc:81
 msgid ""
 "Specifies the person's primary relationship to the institution in broad "
 "categories such as student, faculty, staff, alum, etc."
@@ -6488,7 +6972,7 @@ msgstr ""
 "Dies legt in groben Kategorien die primäre Zugehörigkeit der Person zur "
 "Institution fest."
 
-#: ../lib/modules/eduPerson.inc:91 ../lib/modules/eduPerson.inc:95
+#: ../lib/modules/eduPerson.inc:93 ../lib/modules/eduPerson.inc:97
 msgid ""
 "Specifies the person's relationship(s) to the institution in broad "
 "categories such as student, faculty, staff, alum, etc."
@@ -6496,6 +6980,10 @@ msgstr ""
 "Dies legt die Zugehörigkeiten der Person zur Institution in groben "
 "Kategorien fest."
 
+#: ../lib/modules/asteriskAccount.inc:167
+msgid "Specifies the user's pickup group."
+msgstr "Legt die Pickup-Gruppe des Benutzers fest."
+
 #: ../lib/modules/zarafaUser.inc:93
 msgid "Specifies whether the user is an admin."
 msgstr "Legt fest, ob dieser Account Administratorrechte hat."
@@ -6510,11 +6998,11 @@ msgstr ""
 "muss. Achtung, LAM unterstützt keine Passwortänderungen, die das alte "
 "Passwort voraussetzen."
 
-#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:135
-#: ../lib/modules/inetOrgPerson.inc:189 ../lib/modules/inetOrgPerson.inc:386
-#: ../lib/modules/inetOrgPerson.inc:428 ../lib/modules/inetOrgPerson.inc:567
-#: ../lib/modules/inetOrgPerson.inc:869 ../lib/modules/inetOrgPerson.inc:1121
-#: ../lib/modules/inetOrgPerson.inc:1543
+#: ../lib/modules/inetOrgPerson.inc:124 ../lib/modules/inetOrgPerson.inc:141
+#: ../lib/modules/inetOrgPerson.inc:251 ../lib/modules/inetOrgPerson.inc:448
+#: ../lib/modules/inetOrgPerson.inc:490 ../lib/modules/inetOrgPerson.inc:629
+#: ../lib/modules/inetOrgPerson.inc:938 ../lib/modules/inetOrgPerson.inc:1190
+#: ../lib/modules/inetOrgPerson.inc:1612
 msgid "State"
 msgstr "Bundesland"
 
@@ -6530,29 +7018,30 @@ msgstr "Schritt 1 von 2: Name und Objektklasse(n)"
 msgid "Step 2 of 2: Specify attributes and values"
 msgstr "Schritt 2 von 2: Attribute und Werte"
 
-#: ../lib/modules/inetOrgPerson.inc:237
+#: ../lib/modules/inetOrgPerson.inc:299
 msgid "Steve"
 msgstr "Hans"
 
-#: ../lib/modules/sambaSamAccount.inc:396 ../lib/modules/posixAccount.inc:200
-#: ../lib/modules/inetOrgPerson.inc:1171
+#: ../lib/modules/sambaSamAccount.inc:396 ../lib/modules/posixAccount.inc:203
+#: ../lib/modules/inetOrgPerson.inc:1240
 #: ../lib/modules/asteriskVoicemail.inc:165
 msgid "Steve Miller"
 msgstr "Hans Müller"
 
-#: ../lib/modules/posixAccount.inc:261
+#: ../lib/modules/posixAccount.inc:264
 msgid "Steve Miller,Room 2.14,123-123-1234,123-123-1234"
 msgstr "Hans Müller,Raum 2.14,123-123-1234,123-123-1234"
 
-#: ../lib/modules/eduPerson.inc:167
+#: ../lib/modules/eduPerson.inc:169
 msgid "Steve, Stevo"
 msgstr "Stefan, Steve"
 
 #: ../lib/modules/inetOrgPerson.inc:61 ../lib/modules/inetOrgPerson.inc:121
-#: ../lib/modules/inetOrgPerson.inc:181 ../lib/modules/inetOrgPerson.inc:290
-#: ../lib/modules/inetOrgPerson.inc:416 ../lib/modules/inetOrgPerson.inc:507
-#: ../lib/modules/inetOrgPerson.inc:508 ../lib/modules/inetOrgPerson.inc:849
-#: ../lib/modules/inetOrgPerson.inc:1106 ../lib/modules/inetOrgPerson.inc:1501
+#: ../lib/modules/inetOrgPerson.inc:129 ../lib/modules/inetOrgPerson.inc:243
+#: ../lib/modules/inetOrgPerson.inc:352 ../lib/modules/inetOrgPerson.inc:478
+#: ../lib/modules/inetOrgPerson.inc:569 ../lib/modules/inetOrgPerson.inc:570
+#: ../lib/modules/inetOrgPerson.inc:918 ../lib/modules/inetOrgPerson.inc:1175
+#: ../lib/modules/inetOrgPerson.inc:1570
 msgid "Street"
 msgstr "Straße"
 
@@ -6566,8 +7055,8 @@ msgstr "Unterhalb (kompletter Baum unter Basis-DN)"
 
 #: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:81
 #: ../lib/modules/nisnetgroup.inc:116 ../lib/modules/nisnetgroup.inc:131
-#: ../lib/modules/nisnetgroup.inc:198 ../lib/modules/nisnetgroup.inc:372
-#: ../lib/modules/nisnetgroup.inc:576
+#: ../lib/modules/nisnetgroup.inc:199 ../lib/modules/nisnetgroup.inc:373
+#: ../lib/modules/nisnetgroup.inc:577
 msgid "Subgroups"
 msgstr "Untergruppen"
 
@@ -6577,14 +7066,14 @@ msgstr "Betreff"
 
 #: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:127
 #: ../lib/modules/dhcp_settings.inc:171 ../lib/modules/dhcp_settings.inc:185
-#: ../lib/modules/dhcp_settings.inc:202 ../lib/modules/dhcp_settings.inc:514
-#: ../lib/modules/dhcp_settings.inc:609
+#: ../lib/modules/dhcp_settings.inc:202 ../lib/modules/dhcp_settings.inc:518
+#: ../lib/modules/dhcp_settings.inc:613
 msgid "Subnet"
 msgstr "Subnetz"
 
 #: ../lib/modules/dhcp_settings.inc:160 ../lib/modules/dhcp_settings.inc:179
 #: ../lib/modules/dhcp_settings.inc:196 ../lib/modules/dhcp_settings.inc:254
-#: ../lib/modules/dhcp_settings.inc:546 ../lib/modules/dhcp_settings.inc:617
+#: ../lib/modules/dhcp_settings.inc:550 ../lib/modules/dhcp_settings.inc:621
 msgid "Subnet mask"
 msgstr "Subnetzmaske"
 
@@ -6608,16 +7097,16 @@ msgstr "Sudo-Rollenverwaltung"
 msgid "Sudo roles"
 msgstr "Sudo-Rollen"
 
-#: ../lib/lists.inc:660 ../lib/modules.inc:1257
+#: ../lib/lists.inc:658 ../lib/modules.inc:1257
 msgid "Suffix"
 msgstr "Suffix"
 
-#: ../lib/modules/sambaSamAccount.inc:1274
+#: ../lib/modules/sambaSamAccount.inc:1288
 msgid "Sunday"
 msgstr "Sonntag"
 
 #: ../templates/lists/changePassword.php:193
-#: ../lib/modules/asteriskAccount.inc:78
+#: ../lib/modules/asteriskAccount.inc:89
 #: ../lib/modules/asteriskVoicemail.inc:77
 msgid "Sync Asterisk password with Unix password"
 msgstr "Asterisk-Passwort mit Unix synchronisieren"
@@ -6662,18 +7151,19 @@ msgstr "Ziel der Einladungsregel ist ungültig."
 
 #: ../templates/lists/changePassword.php:240 ../lib/types/user.inc:154
 #: ../lib/modules/inetOrgPerson.inc:51 ../lib/modules/inetOrgPerson.inc:120
-#: ../lib/modules/inetOrgPerson.inc:197 ../lib/modules/inetOrgPerson.inc:322
-#: ../lib/modules/inetOrgPerson.inc:440 ../lib/modules/inetOrgPerson.inc:523
-#: ../lib/modules/inetOrgPerson.inc:524 ../lib/modules/inetOrgPerson.inc:892
-#: ../lib/modules/inetOrgPerson.inc:1110 ../lib/modules/inetOrgPerson.inc:1473
+#: ../lib/modules/inetOrgPerson.inc:147 ../lib/modules/inetOrgPerson.inc:259
+#: ../lib/modules/inetOrgPerson.inc:384 ../lib/modules/inetOrgPerson.inc:502
+#: ../lib/modules/inetOrgPerson.inc:585 ../lib/modules/inetOrgPerson.inc:586
+#: ../lib/modules/inetOrgPerson.inc:961 ../lib/modules/inetOrgPerson.inc:1179
+#: ../lib/modules/inetOrgPerson.inc:1542
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: ../lib/modules/inetOrgPerson.inc:268
+#: ../lib/modules/inetOrgPerson.inc:330
 msgid "Temp"
 msgstr "Aushilfskraft"
 
-#: ../lib/modules/inetOrgPerson.inc:252
+#: ../lib/modules/inetOrgPerson.inc:314
 msgid "Temp, contract until december"
 msgstr "Aushilfskraft, Vertrag bis Dezember"
 
@@ -6682,8 +7172,8 @@ msgid "Template"
 msgstr "Vorlage"
 
 #: ../lib/modules/sambaSamAccount.inc:368
-#: ../lib/modules/sambaSamAccount.inc:574
-#: ../lib/modules/sambaSamAccount.inc:1187
+#: ../lib/modules/sambaSamAccount.inc:581
+#: ../lib/modules/sambaSamAccount.inc:1201
 msgid "Terminal server options"
 msgstr "Terminalserver-Einstellungen"
 
@@ -6699,7 +7189,7 @@ msgstr "Text"
 msgid "Text field"
 msgstr "Textfeld"
 
-#: ../lib/modules/eduPerson.inc:100
+#: ../lib/modules/eduPerson.inc:102
 msgid ""
 "The \"NetID\" of the person for the purposes of inter-institutional "
 "authentication. It should be represented in the form \"user@scope\" where "
@@ -6719,7 +7209,7 @@ msgstr ""
 msgid "The DHCP ranges were changed to fit for the new subnet."
 msgstr "Die DHCP-Bereiche wurden an das neue Subnetz angepasst."
 
-#: ../lib/modules/eduPerson.inc:112
+#: ../lib/modules/eduPerson.inc:114
 msgid ""
 "The DN of the directory entry representing the institution with which the "
 "person is associated."
@@ -6727,7 +7217,7 @@ msgstr ""
 "Dies ist der DN des Verzeichniseintrags, der die Institution der Person "
 "repräsentiert."
 
-#: ../lib/modules/eduPerson.inc:116
+#: ../lib/modules/eduPerson.inc:118
 msgid ""
 "The DN of the directory entry representing the person's primary "
 "organizational unit."
@@ -6735,7 +7225,7 @@ msgstr ""
 "Dies ist der DN des Verzeichniseintrags, der die primäre organisatorische "
 "Einheit der Person repräsentiert."
 
-#: ../lib/modules/eduPerson.inc:120 ../lib/modules/eduPerson.inc:124
+#: ../lib/modules/eduPerson.inc:122 ../lib/modules/eduPerson.inc:126
 msgid ""
 "The DNs of the directory entries representing the person's organizational "
 "units."
@@ -6764,8 +7254,9 @@ msgstr "Die IP-Adressen passen nicht zum Subnetz."
 msgid "The IP address is already in use."
 msgstr "Diese IP-Adresse wird bereits verwendet."
 
-#: ../lib/modules/range.inc:408 ../lib/modules/range.inc:424
-#: ../lib/modules/fixed_ip.inc:384
+#: ../lib/modules/asteriskAccount.inc:638
+#: ../lib/modules/asteriskAccount.inc:639 ../lib/modules/range.inc:408
+#: ../lib/modules/range.inc:424 ../lib/modules/fixed_ip.inc:384
 msgid "The IP address is invalid."
 msgstr "Diese IP-Adresse ist ungültig."
 
@@ -6827,7 +7318,7 @@ msgstr ""
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "Die Domänen-SID des Samba-Servers. Auszulesen mit \"net getlocalsid\"."
 
-#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:69
 msgid ""
 "The UID ranges for users and hosts overlap! This is a problem because LAM "
 "uses the highest UID in use + 1 for new accounts. Please set the minimum UID "
@@ -6847,12 +7338,17 @@ msgstr "Das Unixsocket oder die Named Pipe zum Server."
 msgid "The account context is invalid."
 msgstr "Der Accountkontext ist ungültig."
 
-#: ../lib/modules/asteriskAccount.inc:92
+#: ../lib/modules/asteriskAccount.inc:103
 #: ../lib/modules/asteriskExtension.inc:83
 #: ../lib/modules/asteriskVoicemail.inc:83
 msgid "The account context stores information about the dial plan."
 msgstr "Der Account-Kontext speichert Informationen über den Wählplan."
 
+#: ../lib/modules/asteriskAccount.inc:630
+#: ../lib/modules/asteriskAccount.inc:631
+msgid "The account type is invalid."
+msgstr "Der Accounttyp ist ungültig."
+
 #: ../help/help.inc:151
 msgid "The account will be saved under this LDAP suffix."
 msgstr "Der Account wird unter diesem LDAP-Suffix gespeichert."
@@ -6866,8 +7362,8 @@ msgstr ""
 "Das Attribut %s wird von Ihrem LDAP-Server nicht für die Objektklasse(n) %s "
 "unterstützt."
 
-#: ../lib/modules/asteriskAccount.inc:167
-#: ../lib/modules/asteriskAccount.inc:169
+#: ../lib/modules/asteriskAccount.inc:620
+#: ../lib/modules/asteriskAccount.inc:622
 msgid "The caller ID format is invalid."
 msgstr "Die Anrufer-ID ist ungültig."
 
@@ -6916,8 +7412,8 @@ msgstr "Der angegebene Netbios-Knotentyp existiert nicht."
 msgid "The expiration date is invalid."
 msgstr "Das Ablaufdatum ist ungültig."
 
-#: ../lib/modules/asteriskAccount.inc:171
-#: ../lib/modules/asteriskAccount.inc:172
+#: ../lib/modules/asteriskAccount.inc:624
+#: ../lib/modules/asteriskAccount.inc:625
 msgid "The extension context is invalid."
 msgstr "Der Erweiterungskontext ist ungültig."
 
@@ -6964,8 +7460,8 @@ msgstr ""
 msgid "The home directory will be connected under this drive letter."
 msgstr "Das Heimatverzeichnis wird unter diesem Buchstaben verbunden."
 
-#: ../lib/modules/asteriskAccount.inc:174
-#: ../lib/modules/asteriskAccount.inc:175
+#: ../lib/modules/asteriskAccount.inc:627
+#: ../lib/modules/asteriskAccount.inc:628
 msgid "The host name is invalid."
 msgstr "Der Hostname ist ungültig."
 
@@ -7011,7 +7507,7 @@ msgstr ""
 "Der Name der Log-Datei ist leer oder enthält ungültige Zeichen! Gültige "
 "Zeichen sind: a-z, A-Z, 0-9, /, \\, ., :, _ und -."
 
-#: ../lib/modules/imapAccess.inc:76
+#: ../lib/modules/imapAccess.inc:79
 msgid "The login name of your IMAP user who has rights to create/delete mailboxes."
 msgstr ""
 "Dies ist der Benutzername Ihres IMAP-Administrators der Postfächer erstellen/"
@@ -7097,6 +7593,10 @@ msgstr ""
 "Das neue Passwort wird im Verzeichnis eingetragen sowie Sie diesen Account "
 "speichern."
 
+#: ../lib/modules/asteriskAccount.inc:231
+msgid "The number of milliseconds for the last qualify."
+msgstr "Die Anzahl an Millisekunden für den letzten Verbindungstest."
+
 #: ../help/help.inc:111
 msgid ""
 "The number of users who may login to LAM is restricted. This can be either a "
@@ -7112,11 +7612,11 @@ msgstr ""
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "Die Objektklasse %s wird von Ihrem LDAP-Server nicht unterstützt."
 
-#: ../lib/modules/inetOrgPerson.inc:576
+#: ../lib/modules/inetOrgPerson.inc:638
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "Der Büroname des Benutzers (z.B. IhreFirma, Personalabteilung)."
 
-#: ../templates/selfService/selfServiceMain.php:251 ../lib/modules.inc:1949
+#: ../templates/selfService/selfServiceMain.php:269 ../lib/modules.inc:1967
 msgid "The operation was stopped because of the above errors."
 msgstr "Die Operation wurde aufgrund obiger Fehler gestoppt."
 
@@ -7187,7 +7687,7 @@ msgstr ""
 "Das Passwort ist zu unsicher. Sie müssen mindestens %s Großbuchstaben "
 "eingeben."
 
-#: ../lib/modules/imapAccess.inc:82
+#: ../lib/modules/imapAccess.inc:85
 msgid ""
 "The password of your IMAP admin user. The login name for the IMAP admin user "
 "is stored in the LAM server profile."
@@ -7203,7 +7703,7 @@ msgstr "Das Passwort wurde auf folgenden Wert gesetzt:"
 msgid "The password(s) were set to:"
 msgstr "Das Passwort/die Passwörter wurde(n) auf folgenden Wert gesetzt:"
 
-#: ../lib/modules/posixAccount.inc:334
+#: ../lib/modules/posixAccount.inc:337
 msgid ""
 "The primary group for this account. You can insert a GID number or a group "
 "name."
@@ -7211,11 +7711,11 @@ msgstr ""
 "Die primäre Gruppe dieses Accounts. Sie können eine GID-Nummer oder einen "
 "Gruppennamen angeben."
 
-#: ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:404
 msgid "The primary group the host should be member of."
 msgstr "Die primäre Gruppe des Hosts."
 
-#: ../lib/modules/posixAccount.inc:363
+#: ../lib/modules/posixAccount.inc:366
 msgid "The primary group the user should be member of."
 msgstr "Die primäre Gruppe des Benutzers."
 
@@ -7235,7 +7735,7 @@ msgstr "Der Adressbereich steht im Konflikt mit einem anderen Adressbereich."
 msgid "The range end needs to be greater than the range start."
 msgstr "Das Ende des Adressbereichs muss größer als der Anfang sein."
 
-#: ../lib/modules/inetOrgPerson.inc:556
+#: ../lib/modules/inetOrgPerson.inc:618
 msgid "The room number of the employee's office."
 msgstr "Die Raumnummer des Mitarbeiterbüros."
 
@@ -7247,8 +7747,9 @@ msgstr ""
 "Die Skripte werden auf Ihrem Webserver gestartet. Dazu wird der "
 "Benutzerkontext des Webservers (z.B. apache/www-data) verwendet."
 
+#: ../lib/modules/asteriskAccount.inc:235
 #: ../lib/modules/sambaSamAccount.inc:375 ../lib/modules/zarafaUser.inc:117
-#: ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/inetOrgPerson.inc:646
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
@@ -7260,7 +7761,7 @@ msgstr ""
 msgid "The starting IP address of the range."
 msgstr "Die IP-Adresse mit der der Adressbereich anfängt."
 
-#: ../lib/modules/inetOrgPerson.inc:568
+#: ../lib/modules/inetOrgPerson.inc:630
 msgid "The state where the user resides or works."
 msgstr "Das Bundesland in dem der Benutzer wohnt oder arbeitet."
 
@@ -7310,6 +7811,10 @@ msgstr "Der Benutzeraccount ist nicht aktiv und der Login gesperrt."
 msgid "The user will get warned when his mailbox reaches this limit."
 msgstr "Der Benutzer wird gewarnt falls sein Postfach dieses Limit erreicht."
 
+#: ../lib/modules/asteriskAccount.inc:127
+msgid "The user's call groups."
+msgstr "Die Anrufergruppen des Benutzers."
+
 #: ../lib/modules/sambaSamAccount.inc:112
 msgid ""
 "The value for the Samba 3 field \"User can/must change password\" needs to "
@@ -7339,7 +7844,7 @@ msgstr "Es gibt noch Benutzer, deren primäre Gruppe diese Gruppe ist."
 msgid "There can be only one group of this type."
 msgstr "Es kann nur eine Gruppe diesen Typs geben."
 
-#: ../lib/modules/asteriskAccount.inc:168
+#: ../lib/modules/asteriskAccount.inc:621
 msgid "There is already another user with this caller ID."
 msgstr "Es gibt bereits einen anderen Benutzer mit dieser Anrufer-ID."
 
@@ -7361,7 +7866,7 @@ msgstr ""
 "Gruppen erstellt werden. Neue Gruppen bekommen die immer die höchste "
 "verwendete Zahl plus 1."
 
-#: ../lib/modules/posixAccount.inc:322
+#: ../lib/modules/posixAccount.inc:325
 msgid ""
 "These are the minimum and maximum numbers to use for machine IDs when "
 "creating new accounts for hosts. The range should be different from that of "
@@ -7371,7 +7876,7 @@ msgstr ""
 "erstellt werden. Der Bereich sollte sich von dem der Benutzer unterscheiden. "
 "Neue Hosts bekommen die immer die höchste verwendete Zahl plus 1."
 
-#: ../lib/modules/posixAccount.inc:318
+#: ../lib/modules/posixAccount.inc:321
 msgid ""
 "These are the minimum and maximum numbers to use for user IDs when creating "
 "new user accounts. The range should be different from that of machines. New "
@@ -7402,7 +7907,7 @@ msgstr ""
 "Suffix der Baumansicht gesucht werden falls nicht alle Benutzer nicht im "
 "Standardsuffix sind."
 
-#: ../lib/modules/posixAccount.inc:92
+#: ../lib/modules/posixAccount.inc:94
 msgid "This GID number is invalid! Please provide either a number or a group name."
 msgstr ""
 "Diese GID-Nummer ist ungültig! Bitte geben Sie eine Nummer ein oder einen "
@@ -7431,7 +7936,7 @@ msgid ""
 "or guest."
 msgstr "Hier können Sie spezielle Accounts definieren, z.B. Administrator oder Gast."
 
-#: ../lib/modules/inetOrgPerson.inc:572
+#: ../lib/modules/inetOrgPerson.inc:634
 msgid "This can be used to specify if the user has a car license."
 msgstr "Sie können in diesem Feld speichern, ob der Benutzer einen Führerschein hat."
 
@@ -7483,7 +7988,7 @@ msgstr "Dies ist der Ort des Gerätes."
 msgid "This describes the location of the host."
 msgstr "Dies ist der Ort des Hosts."
 
-#: ../lib/modules/inetOrgPerson.inc:564
+#: ../lib/modules/inetOrgPerson.inc:626
 msgid "This describes the location of the user."
 msgstr "Dies ist der Ort des Benutzers."
 
@@ -7508,7 +8013,7 @@ msgstr "Der Eintrag hat keine Attribute"
 msgid "This entry is the root of a sub-tree containing %s entries."
 msgstr "Dieser Eintrag enthält einen Unterbaum mit %s Einträgen."
 
-#: ../lib/modules/posixAccount.inc:94
+#: ../lib/modules/posixAccount.inc:96
 msgid "This gecos value is invalid!"
 msgstr "Dieser Gecos-Wert ist ungültig!"
 
@@ -7562,7 +8067,7 @@ msgstr ""
 "Dies ist eine Liste von Mitgliedern dieser Gruppe. Mehrere Einträge werden "
 "durch Strichpunkte getrennt."
 
-#: ../lib/modules/eduPerson.inc:87
+#: ../lib/modules/eduPerson.inc:89
 msgid "This is a list of nick names for this user."
 msgstr "Dies ist eine Liste von Spitznamen des Benutzers."
 
@@ -7587,7 +8092,7 @@ msgstr ""
 "Das ist eine Liste von DN-Einträgen aller Benutzer, die sich bei LDAP "
 "Account Manager anmelden dürfen. Bitte geben Sie pro Zeile einen DN an."
 
-#: ../lib/modules/nisObject.inc:67
+#: ../lib/modules/nisObject.inc:67 ../lib/modules/automount.inc:63
 msgid "This is an optional description for this entry."
 msgstr "Hier können Sie eine optionale Beschreibung für den Eintrag angeben."
 
@@ -7602,7 +8107,7 @@ msgstr ""
 "einem Konto mit uid=mueller gesucht."
 
 #: ../lib/modules/ipHost.inc:110 ../lib/modules/device.inc:124
-#: ../lib/modules/eduPerson.inc:216 ../lib/modules/eduPerson.inc:218
+#: ../lib/modules/eduPerson.inc:218 ../lib/modules/eduPerson.inc:220
 #: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/aliasEntry.inc:79
 msgid "This is not a valid DN!"
 msgstr "Das ist keine korrekte DN!"
@@ -7615,7 +8120,7 @@ msgstr "Das ist keine korrekte RID-Nummer!"
 msgid "This is not a valid Samba 3 group type!"
 msgstr "Das ist kein korrekter Samba 3 Gruppentyp!"
 
-#: ../lib/modules/eduPerson.inc:220
+#: ../lib/modules/eduPerson.inc:222
 msgid "This is not a valid list of DNs!"
 msgstr "Das ist keine korrekte Liste von DNs!"
 
@@ -7627,7 +8132,7 @@ msgstr "Das ist eine der öffentlichen Email-Adressen des Benutzers."
 msgid "This is one recipient for this alias."
 msgstr "Dies ist ein Empfänger für diesen Alias."
 
-#: ../lib/modules/asteriskAccount.inc:84
+#: ../lib/modules/asteriskAccount.inc:95
 msgid ""
 "This is the ID of the user in the Asterisk database. It may contain digits "
 "and letters (e.g. user1 or 200134)."
@@ -7645,7 +8150,7 @@ msgstr "Dies ist die IP-Adresse der Netzwerkkarte im Gerät (z.B. 123.123.123.12
 msgid "This is the LDAP DN of the host's manager."
 msgstr "Das ist der LDAP-DN des Managers dieses Hosts."
 
-#: ../lib/modules/inetOrgPerson.inc:504
+#: ../lib/modules/inetOrgPerson.inc:566
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -7722,7 +8227,7 @@ msgstr ""
 "\"#Wert:Beschreibung\" sein. Mehrere Werte werden durch Strichpunkte "
 "getrennt."
 
-#: ../lib/modules/asteriskAccount.inc:88
+#: ../lib/modules/asteriskAccount.inc:99
 msgid ""
 "This is the machine id (e.g. IP address or host name) from which the user "
 "can call/receive calls."
@@ -7738,11 +8243,11 @@ msgstr "Dies ist der Mailserver des Benutzers."
 msgid "This is the name of this group."
 msgstr "Das ist der Name dieser Gruppe."
 
-#: ../lib/modules/posixAccount.inc:409
+#: ../lib/modules/posixAccount.inc:412
 msgid "This is the natural name of the host. If empty, the host name will be used."
 msgstr "Dies ist der übliche Name des Hosts, falls leer wird der Hostname verwendet."
 
-#: ../lib/modules/inetOrgPerson.inc:540
+#: ../lib/modules/inetOrgPerson.inc:602
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
@@ -7750,7 +8255,7 @@ msgstr ""
 "Dies ist der übliche Name des Benutzers, falls leer wird Vor- und Nachname "
 "verwendet."
 
-#: ../lib/modules/posixAccount.inc:387
+#: ../lib/modules/posixAccount.inc:390
 msgid ""
 "This is the natural name of the user. If empty, the first and last name or "
 "user name is used."
@@ -7893,11 +8398,19 @@ msgstr ""
 msgid "This is the user's primary Windows group."
 msgstr "Das ist die primäre Windows-Gruppe des Benutzers."
 
+#: ../lib/modules/asteriskAccount.inc:147
+msgid ""
+"This is typically used to allow incoming calls (e.g. from FWD) while having "
+"a type=friend entry defined with username and password."
+msgstr ""
+"Dies wird typischerweise verwendet um eingehende Anrufe zu erlauben (z.B. "
+"von FWD) wenn ein Typ=friend Eintrag mit Benutzer und Passwort definiert ist."
+
 #: ../lib/modules/zarafaUser.inc:101
 msgid "This is used to mark this account as resource."
 msgstr "Damit wird der Account als Ressource markiert."
 
-#: ../lib/modules/posixAccount.inc:95
+#: ../lib/modules/posixAccount.inc:97
 msgid "This login shell is invalid!"
 msgstr "Login-Shell ist ungültig!"
 
@@ -7905,7 +8418,7 @@ msgstr "Login-Shell ist ungültig!"
 msgid "This mail address is already in use:"
 msgstr "Diese Mailadresse wird bereits verwendet:"
 
-#: ../lib/modules/imapAccess.inc:91
+#: ../lib/modules/imapAccess.inc:97
 msgid "This mailbox will be created/deleted."
 msgstr "Dieses Postfach wird erstellt/gelöscht."
 
@@ -7917,7 +8430,7 @@ msgstr "Dieses Modul benötigt die PHP-Erweiterung ssh2."
 msgid "This object class is obsolete."
 msgstr "Diese Objektklasse ist veraltet."
 
-#: ../lib/modules/imapAccess.inc:73
+#: ../lib/modules/imapAccess.inc:76
 msgid ""
 "This option allows you to disable the certificate check of your IMAP server "
 "certificate. Disabling the certificate check is not recommended."
@@ -8000,7 +8513,7 @@ msgstr "Dieser Wert darf nur \"Room\" oder \"Equipment\" sein."
 #: ../lib/modules/zarafaGroup.inc:143 ../lib/modules/sambaSamAccount.inc:102
 #: ../lib/modules/sambaSamAccount.inc:103
 #: ../lib/modules/sambaSamAccount.inc:104
-#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:96
+#: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:98
 #: ../lib/modules/zarafaUser.inc:360 ../lib/modules/zarafaUser.inc:361
 #: ../lib/modules/zarafaUser.inc:362 ../lib/modules/zarafaUser.inc:363
 #: ../lib/modules/zarafaUser.inc:364 ../lib/modules/ppolicyUser.inc:86
@@ -8016,7 +8529,7 @@ msgstr "Dieser Wert muss eine Liste von Benutzernamen, getrennt duch Kommata, se
 msgid "This will create a new organizational unit under the selected one."
 msgstr "Dies erzeugt eine neue Organizational Unit unterhalb der markierten."
 
-#: ../lib/modules/posixAccount.inc:350
+#: ../lib/modules/posixAccount.inc:353
 msgid "This will create the user's home directory on the specified server."
 msgstr ""
 "Wenn Sie dieses Kästchen aktivieren, dann wird das Heimatverzeichnis des "
@@ -8030,7 +8543,7 @@ msgstr "Dies löscht die markierte Organizational Unit. Die OU muss leer sein."
 msgid "This will delete the selected profile."
 msgstr "Dies löscht das markierte Profil."
 
-#: ../lib/modules/eduPerson.inc:128 ../lib/modules/sambaSamAccount.inc:378
+#: ../lib/modules/eduPerson.inc:130 ../lib/modules/sambaSamAccount.inc:378
 #: ../lib/modules/zarafaUser.inc:121 ../lib/modules/phpGroupwareUser.inc:87
 #: ../lib/modules/shadowAccount.inc:189 ../lib/modules/hostObject.inc:77
 msgid "This will enable the extension automatically if this profile is loaded."
@@ -8058,11 +8571,11 @@ msgstr ""
 "Damit wird der Account für Kolabd als löschbar gekennzeichnet. Verwenden Sie "
 "dies um Kolab-Accounts sauber zu löschen (löscht z.B. das Postfach)."
 
-#: ../lib/modules/sambaSamAccount.inc:1273
+#: ../lib/modules/sambaSamAccount.inc:1287
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../lib/modules/sambaSamAccount.inc:1295
+#: ../lib/modules/sambaSamAccount.inc:1309
 msgid "Time"
 msgstr "Zeit"
 
@@ -8081,7 +8594,7 @@ msgstr ""
 "Während der Ausführung der Lamdaemon-Kommandos wurde die maximale "
 "Ausführungszeit überschritten!"
 
-#: ../lib/modules/posixAccount.inc:379
+#: ../lib/modules/posixAccount.inc:382
 msgid ""
 "To disable login use /bin/false. The list of shells is read from lam/config/"
 "shells"
@@ -8093,7 +8606,7 @@ msgstr ""
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "Tokyo, Seoul, Osaka, Yakutsk"
 
-#: ../templates/tools.php:63 ../templates/main_header.php:98
+#: ../templates/tools.php:63 ../templates/main_header.php:115
 msgid "Tools"
 msgstr "Werkzeuge"
 
@@ -8109,15 +8622,15 @@ msgstr "GID-Nummer als Gruppenname darstellen"
 msgid "Tree suffix"
 msgstr "Baumansicht"
 
-#: ../templates/main_header.php:128
+#: ../templates/main_header.php:145
 msgid "Tree view"
 msgstr "Baumansicht"
 
-#: ../templates/config/confmain.php:434
+#: ../templates/config/confmain.php:432
 msgid "TreeSuffix is invalid!"
 msgstr "BaumSuffix ist ungültig!"
 
-#: ../lib/modules/sambaSamAccount.inc:1273
+#: ../lib/modules/sambaSamAccount.inc:1287
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -8129,15 +8642,15 @@ msgstr "Dienstag"
 msgid "Type"
 msgstr "Typ"
 
-#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:82
 msgid "UID"
 msgstr "Benutzer ID"
 
-#: ../lib/modules/posixAccount.inc:80
+#: ../lib/modules/posixAccount.inc:82
 msgid "UID has changed. Do you want to change home directory?"
 msgstr "UID-Nummer wurde geändert. Soll das Heimatverzeichnis angepasst werden?"
 
-#: ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:77
 msgid ""
 "UID must be a number. It has to be inside the UID range which is defined in "
 "your configuration profile."
@@ -8146,15 +8659,15 @@ msgstr ""
 "in Ihrem Konfigurationsprofil festgelegt ist."
 
 #: ../lib/types/host.inc:95 ../lib/types/user.inc:92
-#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:204
-#: ../lib/modules/posixAccount.inc:278 ../lib/modules/posixAccount.inc:300
-#: ../lib/modules/posixAccount.inc:317 ../lib/modules/posixAccount.inc:321
-#: ../lib/modules/posixAccount.inc:329 ../lib/modules/posixAccount.inc:944
-#: ../lib/modules/posixAccount.inc:1150
+#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:207
+#: ../lib/modules/posixAccount.inc:281 ../lib/modules/posixAccount.inc:303
+#: ../lib/modules/posixAccount.inc:320 ../lib/modules/posixAccount.inc:324
+#: ../lib/modules/posixAccount.inc:332 ../lib/modules/posixAccount.inc:955
+#: ../lib/modules/posixAccount.inc:1161
 msgid "UID number"
 msgstr "UID Nummer"
 
-#: ../lib/modules/posixAccount.inc:76
+#: ../lib/modules/posixAccount.inc:78
 #, php-format
 msgid ""
 "UID number has changed. To keep file ownership you have to run the following "
@@ -8164,7 +8677,7 @@ msgstr ""
 "ausführen um die existierenden Dateirechte zu ändern: 'find / -uid %s -exec "
 "chown %s {} \\;'"
 
-#: ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:69
 msgid "UID ranges for Unix accounts"
 msgstr "UID-Bereiche für Unix-Accounts"
 
@@ -8176,17 +8689,17 @@ msgstr ""
 "UNC-Pfad (\\\\Server\\Freigabe) des Heimatverzeichnisses. $user und $group "
 "werden durch Benutzer- und Gruppenname ersetzt."
 
-#: ../lib/modules/eduPerson.inc:104 ../lib/modules/eduPerson.inc:108
+#: ../lib/modules/eduPerson.inc:106 ../lib/modules/eduPerson.inc:110
 msgid "URI (either URN or URL) that indicates a set of rights to specific resources."
 msgstr ""
 "URI (entweder URN oder URL) die eine Menge an Rechten für bestimmte "
 "Ressourcen definiert."
 
-#: ../lib/modules/imapAccess.inc:135
+#: ../lib/modules/imapAccess.inc:154
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "Die ACLs für die Löschung des Postfaches konnten nicht geändert werden."
 
-#: ../templates/selfService/selfServiceMain.php:254
+#: ../templates/selfService/selfServiceMain.php:272
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
@@ -8199,7 +8712,7 @@ msgstr ""
 msgid "Unable to connect to remote server!"
 msgstr "Kann keine Verbindung zum Server herstellen!"
 
-#: ../lib/modules/imapAccess.inc:137
+#: ../lib/modules/imapAccess.inc:156
 msgid "Unable to create mailbox on IMAP server."
 msgstr "Das Postfach konnte nicht erstellt werden."
 
@@ -8220,18 +8733,18 @@ msgstr "Kann OU nicht löschen!"
 msgid "Unable to delete PDF structure!"
 msgstr "Kann die PDF-Struktur nicht löschen!"
 
-#: ../lib/modules/imapAccess.inc:136
+#: ../lib/modules/imapAccess.inc:155
 msgid "Unable to delete mailbox from IMAP server."
 msgstr "Das Postfach konnte nicht gelöscht werden."
 
-#: ../templates/config/profmanage.php:146
+#: ../templates/config/profmanage.php:150
 #: ../templates/selfService/profManage.php:129
 #: ../templates/profedit/profilemain.php:112
 msgid "Unable to delete profile!"
 msgstr "Kann das Profil nicht löschen!"
 
-#: ../lib/modules/posixAccount.inc:1336 ../lib/modules/posixAccount.inc:1570
-#: ../lib/modules/nisnetgroup.inc:534
+#: ../lib/modules/posixAccount.inc:1347 ../lib/modules/posixAccount.inc:1581
+#: ../lib/modules/nisnetgroup.inc:535
 msgid "Unable to find group in LDAP."
 msgstr "Kann Gruppe nicht im LDAP-Baum finden."
 
@@ -8239,20 +8752,20 @@ msgstr "Kann Gruppe nicht im LDAP-Baum finden."
 msgid "Unable to find the user name in LDAP."
 msgstr "Kann den Benutzernamen nicht in LDAP finden."
 
-#: ../lib/modules.inc:1710 ../lib/modules.inc:1714
+#: ../lib/modules.inc:1711 ../lib/modules.inc:1715
 msgid "Unable to load LDAP entry:"
 msgstr "Kann den LDAP-Eintrag nicht einlesen:"
 
-#: ../lib/profiles.inc:91 ../lib/profiles.inc:95 ../lib/selfService.inc:174
-#: ../lib/selfService.inc:178
+#: ../lib/profiles.inc:91 ../lib/profiles.inc:95 ../lib/selfService.inc:175
+#: ../lib/selfService.inc:179
 msgid "Unable to load profile!"
 msgstr "Kann das Profil nicht laden!"
 
-#: ../lib/modules/imapAccess.inc:138
+#: ../lib/modules/imapAccess.inc:157
 msgid "Unable to locate mailbox on IMAP."
 msgstr "Das Postfach wurde nicht gefunden."
 
-#: ../templates/lists/changePassword.php:505
+#: ../templates/lists/changePassword.php:506
 msgid "Unable to read sambaSID attribute."
 msgstr "Konnte das Attribut sambaSID nicht lesen."
 
@@ -8271,8 +8784,8 @@ msgstr "Kann das Profil nicht speichern!"
 msgid "Unable to send mail!"
 msgstr "Kann die mail nicht versenden!"
 
-#: ../templates/lists/changePassword.php:500
-#: ../templates/lists/changePassword.php:517
+#: ../templates/lists/changePassword.php:501
+#: ../templates/lists/changePassword.php:518
 msgid ""
 "Unable to sync the time when the user can/must change his password because "
 "no domain was found."
@@ -8280,7 +8793,7 @@ msgstr ""
 "Die Zeit wann der Benutzer sein Passwort ändern kann/muss konnte nicht "
 "angepasst werden, da keine Domäne gefunden wurde."
 
-#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixAccount.inc:129
+#: ../lib/modules/posixGroup.inc:289 ../lib/modules/posixAccount.inc:131
 msgid "Unix"
 msgstr "Unix"
 
@@ -8297,7 +8810,7 @@ msgstr "Unbekannte Adresse für Delegation: %s"
 msgid "Unlock Samba account"
 msgstr "Samba 3-Account entsperren"
 
-#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixAccount.inc:998
+#: ../lib/modules/posixGroup.inc:199 ../lib/modules/posixAccount.inc:1009
 msgid "Unlock password"
 msgstr "Passwort reaktivieren"
 
@@ -8317,6 +8830,10 @@ msgstr "Samba-Passwortzeitstempel anpassen"
 msgid "Update attribute \"sambaPwdLastSet\" on password change"
 msgstr "Attribut \"sambaPwdLastSet\" bei Passwortänderung anpassen"
 
+#: ../lib/modules/imapAccess.inc:292 ../lib/modules/imapAccess.inc:301
+msgid "Update quota"
+msgstr "Quota ändern"
+
 #: ../templates/massBuildAccounts.php:199
 msgid "Upload accounts to LDAP"
 msgstr "Accounts in LDAP anlegen"
@@ -8325,7 +8842,7 @@ msgstr "Accounts in LDAP anlegen"
 msgid "Upload file and create accounts"
 msgstr "Datei hochladen und Accounts erstellen"
 
-#: ../templates/massDoUpload.php:125 ../lib/lists.inc:940
+#: ../templates/massDoUpload.php:125 ../lib/lists.inc:927
 msgid "Upload has finished"
 msgstr "Upload wurde beendet"
 
@@ -8347,11 +8864,15 @@ msgstr "Unix-Passwort verwenden"
 #: ../lib/modules/sambaSamAccount.inc:251
 #: ../lib/modules/sambaSamAccount.inc:254
 #: ../lib/modules/sambaSamAccount.inc:414
-#: ../lib/modules/sambaSamAccount.inc:1062
-#: ../lib/modules/sambaSamAccount.inc:1466
+#: ../lib/modules/sambaSamAccount.inc:1076
+#: ../lib/modules/sambaSamAccount.inc:1484
 msgid "Use no password"
 msgstr "Kein Passwort setzen"
 
+#: ../lib/modules/asteriskAccount.inc:179
+msgid "Use this to hide the caller ID."
+msgstr "Benutzen Sie dies um die Anrufer-ID zu verstecken."
+
 #: ../lib/modules/zarafaGroup.inc:76 ../lib/modules/zarafaUser.inc:65
 msgid "Use this to hide this entry from the address book."
 msgstr "Benutzen Sie diese Einstellung um Einträge im Adressbuch zu verstecken."
@@ -8378,6 +8899,10 @@ msgstr ""
 "Wird für die Berechnung der RIDs aus UID/GID verwendet. Nicht ändern, wenn "
 "Sie nicht sicher sind."
 
+#: ../lib/modules/asteriskAccount.inc:211
+msgid "Used for registration context."
+msgstr "Wird für den Registrierungskontext verwendet."
+
 #: ../lib/modules/quota.inc:123 ../lib/modules/quota.inc:391
 msgid "Used inodes"
 msgstr "benutzte Inodes"
@@ -8386,8 +8911,27 @@ msgstr "benutzte Inodes"
 msgid "Used inodes (files)"
 msgstr "Benutze Inodes (Dateien)"
 
-#: ../lib/modules/sambaGroupMapping.inc:69 ../lib/modules/nisnetgroup.inc:209
-#: ../lib/modules/nisnetgroup.inc:582
+#: ../lib/modules/asteriskAccount.inc:183
+msgid "Used to automatically hangup the call if no RTP traffic is received."
+msgstr ""
+"Damit wird ein Anruf automatisch beendet wenn kein RTP-Verkehr empfangen "
+"wird."
+
+#: ../lib/modules/asteriskAccount.inc:159
+#: ../lib/modules/asteriskAccount.inc:163
+msgid "Used to limit SIP traffic to and from this peer to a certain IP or network."
+msgstr ""
+"Damit lässt sich der SIP-Verkehr von und zu diesem Teilnehmer und einer "
+"bestimmten IP bzw. einem Netzwerk beschränken."
+
+#: ../lib/modules/asteriskAccount.inc:175
+msgid "Used to regularly check that a device is still online."
+msgstr ""
+"Damit wird in regelmäßigen Intervallen geprüft, ob das Gerät noch "
+"angeschlossen ist."
+
+#: ../lib/modules/sambaGroupMapping.inc:69 ../lib/modules/nisnetgroup.inc:210
+#: ../lib/modules/nisnetgroup.inc:583
 msgid "User"
 msgstr "Benutzer"
 
@@ -8399,16 +8943,25 @@ msgstr "Benutzer ID"
 msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "Benutzeraccounts (z.B. Unix, Samba und Kolab)"
 
+#: ../lib/modules/asteriskAccount.inc:118
+#: ../lib/modules/asteriskAccount.inc:249
+#: ../lib/modules/asteriskAccount.inc:332
+#: ../lib/modules/asteriskAccount.inc:404
+#: ../lib/modules/asteriskAccount.inc:694
+#: ../lib/modules/asteriskAccount.inc:1193
+msgid "User agent"
+msgstr "Benutzeragent"
+
 #: ../lib/modules/sambaSamAccount.inc:275
-#: ../lib/modules/sambaSamAccount.inc:1076
+#: ../lib/modules/sambaSamAccount.inc:1090
 msgid "User can change password"
 msgstr "Benutzer kann Passwort ändern"
 
-#: ../lib/modules/posixAccount.inc:359
+#: ../lib/modules/posixAccount.inc:362
 msgid "User description. If left empty first and last name will be used."
 msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 
-#: ../lib/modules/inetOrgPerson.inc:484
+#: ../lib/modules/inetOrgPerson.inc:546
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 
@@ -8421,7 +8974,7 @@ msgid "User modification"
 msgstr "Vom Benutzer änderbar"
 
 #: ../lib/modules/sambaSamAccount.inc:277
-#: ../lib/modules/sambaSamAccount.inc:1082
+#: ../lib/modules/sambaSamAccount.inc:1096
 msgid "User must change password"
 msgstr "Benutzer muss Passwort ändern"
 
@@ -8429,29 +8982,33 @@ msgstr "Benutzer muss Passwort ändern"
 #: ../lib/types/alias.inc:91 ../lib/types/user.inc:94
 #: ../lib/modules/account.inc:78 ../lib/modules/account.inc:94
 #: ../lib/modules/account.inc:117 ../lib/modules/account.inc:119
-#: ../lib/modules/account.inc:120 ../lib/modules/account.inc:206
-#: ../lib/modules/account.inc:232 ../lib/modules/account.inc:256
+#: ../lib/modules/account.inc:120 ../lib/modules/account.inc:207
+#: ../lib/modules/account.inc:233 ../lib/modules/account.inc:257
 #: ../lib/modules/uidObject.inc:38 ../lib/modules/uidObject.inc:60
 #: ../lib/modules/uidObject.inc:69 ../lib/modules/uidObject.inc:78
 #: ../lib/modules/uidObject.inc:93 ../lib/modules/uidObject.inc:155
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:82
-#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:190
-#: ../lib/modules/posixAccount.inc:299 ../lib/modules/posixAccount.inc:354
-#: ../lib/modules/posixAccount.inc:933 ../lib/modules/posixAccount.inc:1148
-#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:471
-#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:476
-#: ../lib/modules/inetOrgPerson.inc:543 ../lib/modules/inetOrgPerson.inc:821
-#: ../lib/modules/inetOrgPerson.inc:1118 ../lib/modules/inetOrgPerson.inc:1176
+#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:84
+#: ../lib/modules/posixAccount.inc:87 ../lib/modules/posixAccount.inc:193
+#: ../lib/modules/posixAccount.inc:302 ../lib/modules/posixAccount.inc:357
+#: ../lib/modules/posixAccount.inc:944 ../lib/modules/posixAccount.inc:1159
+#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:472
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:538
+#: ../lib/modules/inetOrgPerson.inc:605 ../lib/modules/inetOrgPerson.inc:890
+#: ../lib/modules/inetOrgPerson.inc:1187 ../lib/modules/inetOrgPerson.inc:1245
 msgid "User name"
 msgstr "Benutzername"
 
-#: ../lib/modules/posixAccount.inc:89 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/posixAccount.inc:91 ../lib/modules/inetOrgPerson.inc:75
 msgid "User name already exists!"
 msgstr "Benutzername besteht schon!"
 
+#: ../lib/modules/imapAccess.inc:93 ../lib/modules/imapAccess.inc:121
+msgid "User name attribute"
+msgstr "Attribut für Benutzernamen"
+
 #: ../lib/modules/account.inc:117 ../lib/modules/account.inc:118
 #: ../lib/modules/account.inc:120 ../lib/modules/uidObject.inc:78
-#: ../lib/modules/posixAccount.inc:82 ../lib/modules/posixAccount.inc:87
+#: ../lib/modules/posixAccount.inc:84 ../lib/modules/posixAccount.inc:89
 #: ../lib/modules/zarafaUser.inc:358 ../lib/modules/zarafaUser.inc:359
 #: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/inetOrgPerson.inc:73
 #: ../lib/modules/inetOrgPerson.inc:74
@@ -8462,14 +9019,14 @@ msgstr ""
 "Benutzername enthält ungültige Zeichen. Gültige Zeichen sind: a-z, A-Z, 0-9 "
 "und .-_ !"
 
-#: ../lib/modules/posixAccount.inc:85
+#: ../lib/modules/posixAccount.inc:87
 msgid "User name in use. Selected next free user name."
 msgstr ""
 "Der Benutzername ist bereits vorhanden, der nächste freie Name wurde "
 "ausgewählt."
 
-#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:355
-#: ../lib/modules/inetOrgPerson.inc:544
+#: ../lib/modules/account.inc:95 ../lib/modules/posixAccount.inc:358
+#: ../lib/modules/inetOrgPerson.inc:606
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-"
 "Z,0-9, .-_. If user name is already used user name will be expanded with a "
@@ -8494,9 +9051,9 @@ msgstr "Benutzerserver"
 msgid "User(s)"
 msgstr "Benutzer"
 
-#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:61
-#: ../lib/modules/posixAccount.inc:62 ../lib/modules/posixAccount.inc:65
-#: ../lib/modules/posixAccount.inc:160 ../lib/modules/sudoRole.inc:63
+#: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:63
+#: ../lib/modules/posixAccount.inc:64 ../lib/modules/posixAccount.inc:67
+#: ../lib/modules/posixAccount.inc:163 ../lib/modules/sudoRole.inc:63
 #: ../lib/modules/sudoRole.inc:87 ../lib/modules/sudoRole.inc:134
 #: ../lib/modules/sudoRole.inc:173 ../lib/modules/sudoRole.inc:182
 #: ../lib/modules/sudoRole.inc:264 ../lib/modules/sudoRole.inc:687
@@ -8537,7 +9094,7 @@ msgstr "Für die Verbindung zum Remote-Server wird %s verwendet."
 msgid "Using template:"
 msgstr "Verwendete Vorlage:"
 
-#: ../lib/modules/posixAccount.inc:314
+#: ../lib/modules/posixAccount.inc:317
 msgid ""
 "Usually, users are not added to groups as memberUid if they have this group "
 "as primary group. If your application ignores primary groups then you can "
@@ -8552,7 +9109,7 @@ msgstr ""
 msgid "Valid users"
 msgstr "Berechtigte Benutzer"
 
-#: ../lib/modules/imapAccess.inc:72 ../lib/modules/imapAccess.inc:99
+#: ../lib/modules/imapAccess.inc:75 ../lib/modules/imapAccess.inc:108
 msgid "Validate server certificate"
 msgstr "Serverzertifikat prüfen"
 
@@ -8585,12 +9142,12 @@ msgstr "Sie möchten mehr Funktionen? Bestellen Sie LAM Pro!"
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../templates/delete.php:216 ../lib/modules.inc:2013
+#: ../templates/delete.php:216 ../lib/modules.inc:2031
 #, php-format
 msgid "Was unable to add attribtues to DN: %s."
 msgstr "Konnte keine Attribute zum DN hinzufügen: %s."
 
-#: ../lib/modules.inc:1983
+#: ../lib/modules.inc:2001
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "Konnte DN nicht erstellen: %s."
@@ -8603,27 +9160,27 @@ msgstr "Konnte DN nicht löschen: %s."
 
 #: ../templates/tree/update.php:109 ../templates/tree/add_oclass.php:93
 #: ../templates/tree/add_oclass_form.php:162 ../templates/delete.php:207
-#: ../lib/modules.inc:2001
+#: ../lib/modules.inc:2019
 #, php-format
 msgid "Was unable to modify attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht ändern: %s."
 
-#: ../templates/lists/changePassword.php:545
+#: ../templates/lists/changePassword.php:578
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "Konnte die Attribute von DN %s nicht ändern."
 
-#: ../templates/delete.php:225 ../lib/modules.inc:2025
+#: ../templates/delete.php:225 ../lib/modules.inc:2043
 #, php-format
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht löschen: %s."
 
-#: ../lib/modules.inc:1964
+#: ../lib/modules.inc:1982
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "Konnte DN nicht umbenennen: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1273
+#: ../lib/modules/sambaSamAccount.inc:1287
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -8653,9 +9210,9 @@ msgstr "Windows-Domänenname des Accounts."
 
 #: ../lib/modules/sambaSamAccount.inc:193
 #: ../lib/modules/sambaSamAccount.inc:445
-#: ../lib/modules/sambaSamAccount.inc:1159
-#: ../lib/modules/sambaSamAccount.inc:1514
-#: ../lib/modules/sambaSamAccount.inc:1654
+#: ../lib/modules/sambaSamAccount.inc:1173
+#: ../lib/modules/sambaSamAccount.inc:1532
+#: ../lib/modules/sambaSamAccount.inc:1672
 #: ../lib/modules/sambaGroupMapping.inc:278
 #: ../lib/modules/sambaGroupMapping.inc:322
 #: ../lib/modules/sambaGroupMapping.inc:391
@@ -8698,8 +9255,8 @@ msgstr "Arbeitsgruppe"
 
 #: ../lib/modules/sambaSamAccount.inc:217
 #: ../lib/modules/sambaSamAccount.inc:344
-#: ../lib/modules/sambaSamAccount.inc:1402
-#: ../lib/modules/sambaSamAccount.inc:1674
+#: ../lib/modules/sambaSamAccount.inc:1420
+#: ../lib/modules/sambaSamAccount.inc:1692
 msgid "Working directory"
 msgstr "Arbeitsverzeichnis"
 
@@ -8721,9 +9278,13 @@ msgstr "Schreibzugriff"
 msgid "Wrong password/user name combination. Please try again."
 msgstr "Falsche Benutzername/Passwort-Kombination. Bitte erneut eingeben."
 
+#: ../lib/modules/imapAccess.inc:162
+msgid "Wrong quota format. Quota must be numeric."
+msgstr "Das Quota-Format ist falsch. Es muss numerisch sein."
+
 #: ../templates/schema/schema.php:151 ../templates/schema/schema.php:193
 #: ../templates/schema/schema.php:198 ../templates/schema/schema.php:203
-#: ../lib/modules/imapAccess.inc:99
+#: ../lib/modules/imapAccess.inc:108
 msgid "Yes"
 msgstr "Ja"
 
@@ -8743,7 +9304,7 @@ msgstr ""
 "Sie verwenden Großbuchstaben, das kann Probleme verursachen, da Windows "
 "Groß-/Kleinschreibung nicht unterscheidet."
 
-#: ../lib/modules/posixAccount.inc:81 ../lib/modules/posixAccount.inc:83
+#: ../lib/modules/posixAccount.inc:83 ../lib/modules/posixAccount.inc:85
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
@@ -8818,11 +9379,11 @@ msgstr "Bitte setzen Sie einen Wert für das erforderliche Attribut: %s"
 msgid "You made no changes."
 msgstr "Es wurde nichts geändert."
 
-#: ../lib/modules/groupOfNames.inc:124 ../lib/modules/groupOfNames.inc:125
+#: ../lib/modules/groupOfNames.inc:142 ../lib/modules/groupOfNames.inc:143
 msgid "You need to add at least one member to this group."
 msgstr "Sie müssen mindestens ein Mitglied zu dieser Gruppe hinzufügen."
 
-#: ../lib/modules/imapAccess.inc:139
+#: ../lib/modules/imapAccess.inc:158
 msgid "Your IMAP domain(s) and email address domain do not match."
 msgstr "Ihre IMAP-Domänen stimmen nicht mit der EMail-Adresse überein."
 
@@ -8840,6 +9401,10 @@ msgstr ""
 "Ihr LAM-Admin-Benutzer muss ein gültiger Unix-Account sein um mit Lamdaemon "
 "zu funktionieren!"
 
+#: ../lib/modules/imapAccess.inc:160
+msgid "Your LAM login password was not accepted by the IMAP server."
+msgstr "Ihr LAM-Anmeldepasswort wurde vom IMAP-Server nicht akzeptiert."
+
 #: ../templates/tree/add_attr_form.php:165
 msgid ""
 "Your PHP configuration has disabled file uploads. Please check php.ini "
@@ -8863,7 +9428,7 @@ msgstr "Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an."
 msgid "Your settings were successfully saved."
 msgstr "Ihre Einstellungen wurden erfolgreich gespeichert."
 
-#: ../lib/modules/inetOrgPerson.inc:404
+#: ../lib/modules/inetOrgPerson.inc:466
 msgid "YourCompany, Human Resources"
 msgstr "IhreFirma, Personalabteilung"
 
@@ -8896,7 +9461,7 @@ msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profile\\hmueller"
 
 #: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:332
+#: ../lib/modules/phpGroupwareUser.inc:333
 msgid "active"
 msgstr "aktiv"
 
@@ -8905,7 +9470,7 @@ msgid "add value"
 msgstr "Wert hinzufügen"
 
 #: ../lib/modules/posixGroup.inc:366 ../lib/modules/nisnetgroup.inc:104
-#: ../lib/modules/groupOfNames.inc:86
+#: ../lib/modules/groupOfNames.inc:90
 msgid "adminstrators"
 msgstr "administratoren"
 
@@ -8933,13 +9498,13 @@ msgstr "Standard"
 msgid "delete attribute"
 msgstr "Attribut löschen"
 
-#: ../lib/modules/sambaSamAccount.inc:1417
-#: ../lib/modules/sambaSamAccount.inc:1694
+#: ../lib/modules/sambaSamAccount.inc:1435
+#: ../lib/modules/sambaSamAccount.inc:1712
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: ../lib/modules/sambaSamAccount.inc:1428
-#: ../lib/modules/sambaSamAccount.inc:1705
+#: ../lib/modules/sambaSamAccount.inc:1446
+#: ../lib/modules/sambaSamAccount.inc:1723
 msgid "disconnect"
 msgstr "trennen"
 
@@ -8958,17 +9523,17 @@ msgstr "falsch"
 msgid "force"
 msgstr "erzwingen"
 
-#: ../lib/modules/sambaSamAccount.inc:1436
-#: ../lib/modules/sambaSamAccount.inc:1713
+#: ../lib/modules/sambaSamAccount.inc:1454
+#: ../lib/modules/sambaSamAccount.inc:1731
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: ../lib/modules/sambaSamAccount.inc:1437
-#: ../lib/modules/sambaSamAccount.inc:1714
+#: ../lib/modules/sambaSamAccount.inc:1455
+#: ../lib/modules/sambaSamAccount.inc:1732
 msgid "from previous client only"
 msgstr "nur vom letzten Client"
 
-#: ../lib/modules/posixAccount.inc:219 ../lib/modules/nisnetgroup.inc:118
+#: ../lib/modules/posixAccount.inc:222 ../lib/modules/nisnetgroup.inc:118
 msgid "group01,group02"
 msgstr "gruppe01,gruppe02"
 
@@ -8985,27 +9550,27 @@ msgid "hours"
 msgstr "Stunden"
 
 #: ../lib/modules/phpGroupwareUser.inc:162
-#: ../lib/modules/phpGroupwareUser.inc:335
+#: ../lib/modules/phpGroupwareUser.inc:336
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../lib/modules/sambaSamAccount.inc:1421
-#: ../lib/modules/sambaSamAccount.inc:1698
+#: ../lib/modules/sambaSamAccount.inc:1439
+#: ../lib/modules/sambaSamAccount.inc:1716
 msgid "input off, notify off"
 msgstr "Eingabe aus, Benachrichtigung aus"
 
-#: ../lib/modules/sambaSamAccount.inc:1420
-#: ../lib/modules/sambaSamAccount.inc:1697
+#: ../lib/modules/sambaSamAccount.inc:1438
+#: ../lib/modules/sambaSamAccount.inc:1715
 msgid "input off, notify on"
 msgstr "Eingabe aus, Benachrichtigung ein"
 
-#: ../lib/modules/sambaSamAccount.inc:1419
-#: ../lib/modules/sambaSamAccount.inc:1696
+#: ../lib/modules/sambaSamAccount.inc:1437
+#: ../lib/modules/sambaSamAccount.inc:1714
 msgid "input on, notify off"
 msgstr "Eingabe ein, Benachrichtigung aus"
 
-#: ../lib/modules/sambaSamAccount.inc:1418
-#: ../lib/modules/sambaSamAccount.inc:1695
+#: ../lib/modules/sambaSamAccount.inc:1436
+#: ../lib/modules/sambaSamAccount.inc:1713
 msgid "input on, notify on"
 msgstr "Eingabe ein, Benachrichtigung ein"
 
@@ -9027,7 +9592,7 @@ msgstr ""
 "ldaps://ldap.domain.com baut eine verschlüsselte Verbindung zu ldap.domain."
 "com auf."
 
-#: ../lib/modules/posixAccount.inc:286
+#: ../lib/modules/posixAccount.inc:289
 msgid "machines"
 msgstr "Hosts"
 
@@ -9047,11 +9612,11 @@ msgstr "meineGruppe"
 #: ../templates/config/confmain.php:225 ../lib/modules/zarafaGroup.inc:419
 #: ../lib/modules/zarafaGroup.inc:426 ../lib/modules/zarafaGroup.inc:429
 #: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1662
-#: ../lib/modules/sambaSamAccount.inc:1670
 #: ../lib/modules/sambaSamAccount.inc:1680
-#: ../lib/modules/sambaSamAccount.inc:1685
-#: ../lib/modules/sambaSamAccount.inc:1690 ../lib/modules/zarafaUser.inc:1034
+#: ../lib/modules/sambaSamAccount.inc:1688
+#: ../lib/modules/sambaSamAccount.inc:1698
+#: ../lib/modules/sambaSamAccount.inc:1703
+#: ../lib/modules/sambaSamAccount.inc:1708 ../lib/modules/zarafaUser.inc:1034
 #: ../lib/modules/zarafaUser.inc:1079 ../lib/modules/zarafaUser.inc:1085
 #: ../lib/modules/zarafaUser.inc:1091 ../lib/modules/ppolicy.inc:34
 #: ../lib/modules/ppolicy.inc:449 ../lib/modules/ppolicy.inc:465
@@ -9090,16 +9655,16 @@ msgstr ""
 "ou=People,dc=yourcompany,dc=com liest und speichert alle Accounts in diesem "
 "Unterzweig."
 
-#: ../lib/modules/eduPerson.inc:179 ../lib/modules/eduPerson.inc:185
-#: ../lib/modules/eduPerson.inc:191
+#: ../lib/modules/eduPerson.inc:181 ../lib/modules/eduPerson.inc:187
+#: ../lib/modules/eduPerson.inc:193
 msgid "ou=accounts,dc=yourdomain,dc=org"
 msgstr "ou=accounts,dc=ihreFirma,dc=de"
 
-#: ../lib/modules/posixAccount.inc:272
+#: ../lib/modules/posixAccount.inc:275
 msgid "pc01$"
 msgstr "pc01$"
 
-#: ../lib/modules/posixAccount.inc:293
+#: ../lib/modules/posixAccount.inc:296
 msgid "pc01,Room 2.34"
 msgstr "pc01,Raum 2.34"
 
@@ -9107,24 +9672,24 @@ msgstr "pc01,Raum 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:246 ../templates/config/confmain.php:364
-#: ../templates/selfService/adminMain.php:615
+#: ../templates/tree/edit.php:246 ../lib/html.inc:488 ../lib/html.inc:1214
+#: ../lib/html.inc:1604
 msgid "required"
 msgstr "erforderlich"
 
-#: ../lib/modules/sambaSamAccount.inc:1429
-#: ../lib/modules/sambaSamAccount.inc:1706
+#: ../lib/modules/sambaSamAccount.inc:1447
+#: ../lib/modules/sambaSamAccount.inc:1724
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: ../lib/modules/asteriskAccount.inc:156 ../lib/modules/posixGroup.inc:357
-#: ../lib/modules/sambaSamAccount.inc:402 ../lib/modules/posixAccount.inc:247
+#: ../lib/modules/asteriskAccount.inc:391 ../lib/modules/posixGroup.inc:357
+#: ../lib/modules/sambaSamAccount.inc:402 ../lib/modules/posixAccount.inc:250
 #: ../lib/modules/asteriskVoicemail.inc:158
 msgid "secret"
 msgstr "geheim"
 
-#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:192
-#: ../lib/modules/inetOrgPerson.inc:1178 ../lib/modules/nisMailAlias.inc:91
+#: ../lib/modules/uidObject.inc:62 ../lib/modules/posixAccount.inc:195
+#: ../lib/modules/inetOrgPerson.inc:1247 ../lib/modules/nisMailAlias.inc:91
 msgid "smiller"
 msgstr "hmueller"
 
@@ -9156,7 +9721,7 @@ msgstr "test-start"
 msgid "true"
 msgstr "wahr"
 
-#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:276
+#: ../lib/modules/ipHost.inc:92 ../lib/modules/inetOrgPerson.inc:338
 #: ../lib/modules/aliasEntry.inc:64
 msgid "uid=smiller,ou=People,dc=company,dc=com"
 msgstr "uid=hmueller,ou=People,dc=ihreFirma,dc=de"
@@ -9165,28 +9730,28 @@ msgstr "uid=hmueller,ou=People,dc=ihreFirma,dc=de"
 msgid "user01,user02,user03"
 msgstr "benutzer01,benutzer02,benutzer03"
 
-#: ../lib/modules/eduPerson.inc:140 ../lib/modules/inetOrgPerson.inc:356
+#: ../lib/modules/eduPerson.inc:142 ../lib/modules/inetOrgPerson.inc:418
 #: ../lib/modules/asteriskVoicemail.inc:171
 msgid "user@company.com"
 msgstr "benutzer@firma.de"
 
-#: ../lib/modules/posixAccount.inc:212
+#: ../lib/modules/posixAccount.inc:215
 msgid "users"
 msgstr "Benutzer"
 
 #: ../templates/config/confmain.php:225 ../lib/modules/zarafaGroup.inc:421
 #: ../lib/modules/zarafaGroup.inc:424 ../lib/modules/zarafaGroup.inc:431
 #: ../lib/modules/sambaSamAccount.inc:558
-#: ../lib/modules/sambaSamAccount.inc:1660
-#: ../lib/modules/sambaSamAccount.inc:1668
 #: ../lib/modules/sambaSamAccount.inc:1678
-#: ../lib/modules/sambaSamAccount.inc:1683
-#: ../lib/modules/sambaSamAccount.inc:1688 ../lib/modules/zarafaUser.inc:1036
+#: ../lib/modules/sambaSamAccount.inc:1686
+#: ../lib/modules/sambaSamAccount.inc:1696
+#: ../lib/modules/sambaSamAccount.inc:1701
+#: ../lib/modules/sambaSamAccount.inc:1706 ../lib/modules/zarafaUser.inc:1036
 #: ../lib/modules/zarafaUser.inc:1081 ../lib/modules/zarafaUser.inc:1087
 #: ../lib/modules/zarafaUser.inc:1093 ../lib/modules/ppolicy.inc:35
 #: ../lib/modules/ppolicy.inc:467 ../lib/modules/ppolicy.inc:472
 #: ../lib/modules/ppolicy.inc:475 ../lib/modules/ppolicy.inc:482
-#: ../lib/modules/inetOrgPerson.inc:396 ../lib/modules/zarafaServer.inc:323
+#: ../lib/modules/inetOrgPerson.inc:458 ../lib/modules/zarafaServer.inc:323
 msgid "yes"
 msgstr "ja"