diff --git a/lam/locale/en_US/LC_MESSAGES/messages.mo b/lam/locale/en_US/LC_MESSAGES/messages.mo
index 677e4881..d60cdb3c 100644
Binary files a/lam/locale/en_US/LC_MESSAGES/messages.mo and b/lam/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/en_US/LC_MESSAGES/messages.po b/lam/locale/en_US/LC_MESSAGES/messages.po
index 2aa10082..87b813d5 100644
--- a/lam/locale/en_US/LC_MESSAGES/messages.po
+++ b/lam/locale/en_US/LC_MESSAGES/messages.po
@@ -1,12 +1,12 @@
 #
 # LDAP Account Manager
 #
-# Roland Gruber <post@rolandgruber.de>, 2013, 2014, 2015, 2016.
+# Roland Gruber <post@rolandgruber.de>, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: LAM\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
-"PO-Revision-Date: 2016-11-28 18:57+0100\n"
+"PO-Revision-Date: 2017-02-25 13:45+0100\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team: German <post@rolandgruber.de>\n"
 "Language: de\n"
@@ -19,29 +19,29 @@ msgstr ""
 #: ../lib/modules/zarafaContact.inc:101 ../lib/modules/zarafaContact.inc:104
 #: ../lib/modules/zarafaContact.inc:107 ../lib/modules/zarafaContact.inc:136
 #: ../lib/modules/zarafaGroup.inc:102 ../lib/modules/zarafaGroup.inc:105
-#: ../lib/modules/zarafaGroup.inc:108 ../lib/modules/zarafaGroup.inc:757
-#: ../lib/modules/zarafaUser.inc:158 ../lib/modules/zarafaUser.inc:161
-#: ../lib/modules/zarafaUser.inc:164 ../lib/modules/zarafaUser.inc:1853
+#: ../lib/modules/zarafaGroup.inc:108 ../lib/modules/zarafaGroup.inc:755
+#: ../lib/modules/zarafaUser.inc:161 ../lib/modules/zarafaUser.inc:164
+#: ../lib/modules/zarafaUser.inc:167 ../lib/modules/zarafaUser.inc:1854
 msgid "\"Send as\" attribute"
 msgstr "Used by attributes"
 
 #: ../lib/modules/zarafaContact.inc:85 ../lib/modules/zarafaContact.inc:167
 #: ../lib/modules/zarafaContact.inc:190 ../lib/modules/zarafaContact.inc:207
 #: ../lib/modules/zarafaContact.inc:253 ../lib/modules/zarafaContact.inc:398
-#: ../lib/modules/zarafaContact.inc:617 ../lib/modules/zarafaGroup.inc:98
+#: ../lib/modules/zarafaContact.inc:615 ../lib/modules/zarafaGroup.inc:98
 #: ../lib/modules/zarafaGroup.inc:171 ../lib/modules/zarafaGroup.inc:189
 #: ../lib/modules/zarafaGroup.inc:205 ../lib/modules/zarafaGroup.inc:248
-#: ../lib/modules/zarafaGroup.inc:405 ../lib/modules/zarafaGroup.inc:629
-#: ../lib/modules/zarafaGroup.inc:777 ../lib/modules/zarafaUser.inc:118
-#: ../lib/modules/zarafaUser.inc:214 ../lib/modules/zarafaUser.inc:374
-#: ../lib/modules/zarafaUser.inc:404 ../lib/modules/zarafaUser.inc:441
-#: ../lib/modules/zarafaUser.inc:487 ../lib/modules/zarafaUser.inc:874
-#: ../lib/modules/zarafaUser.inc:1272 ../lib/modules/zarafaUser.inc:1506
-#: ../lib/modules/zarafaUser.inc:1832
+#: ../lib/modules/zarafaGroup.inc:405 ../lib/modules/zarafaGroup.inc:627
+#: ../lib/modules/zarafaGroup.inc:775 ../lib/modules/zarafaUser.inc:121
+#: ../lib/modules/zarafaUser.inc:217 ../lib/modules/zarafaUser.inc:377
+#: ../lib/modules/zarafaUser.inc:407 ../lib/modules/zarafaUser.inc:444
+#: ../lib/modules/zarafaUser.inc:490 ../lib/modules/zarafaUser.inc:877
+#: ../lib/modules/zarafaUser.inc:1273 ../lib/modules/zarafaUser.inc:1507
+#: ../lib/modules/zarafaUser.inc:1833
 msgid "\"Send as\" privileges"
 msgstr "\"Send as\" privileges"
 
-#: ../lib/modules/nisnetgroup.inc:134
+#: ../lib/modules/nisnetgroup.inc:137
 msgid "(host1,user1,example.com);(host2,user2,example.com)"
 msgstr "(host1,user1,example.com);(host2,user2,example.com)"
 
@@ -49,31 +49,40 @@ msgstr "(host1,user1,example.com);(host2,user2,example.com)"
 msgid "/home/smiller"
 msgstr "smiller"
 
-#: ../lib/modules/inetOrgPerson.inc:428
+#: ../lib/modules/inetOrgPerson.inc:426
 #: ../lib/modules/asteriskVoicemail.inc:186
 msgid "123-123-1234"
 msgstr "123-123-1234"
 
 #: ../lib/modules/windowsUser.inc:623 ../lib/modules/windowsUser.inc:631
-#: ../lib/modules/inetOrgPerson.inc:444
+#: ../lib/modules/inetOrgPerson.inc:442
 msgid "123-123-1235"
 msgstr "123-123-1235"
 
 #: ../lib/modules/windowsUser.inc:599 ../lib/modules/windowsUser.inc:607
-#: ../lib/modules/windowsUser.inc:615 ../lib/modules/inetOrgPerson.inc:452
-#: ../lib/modules/inetOrgPerson.inc:460
+#: ../lib/modules/windowsUser.inc:615 ../lib/modules/inetOrgPerson.inc:450
+#: ../lib/modules/inetOrgPerson.inc:458
 msgid "123-123-1236"
 msgstr "123-123-1236"
 
 #: ../lib/modules/windowsUser.inc:498 ../lib/modules/windowsUser.inc:504
-#: ../lib/modules/inetOrgPerson.inc:436
+#: ../lib/modules/inetOrgPerson.inc:434
 msgid "123-124-1234"
 msgstr "123-124-1234"
 
-#: ../lib/modules/windowsUser.inc:456 ../lib/modules/inetOrgPerson.inc:420
+#: ../lib/modules/windowsUser.inc:456 ../lib/modules/inetOrgPerson.inc:418
 msgid "12345"
 msgstr "12345"
 
+#: ../templates/config/confmain.php:533
+#: ../templates/selfService/adminMain.php:535 ../help/help.inc:282
+msgid "2-factor authentication"
+msgstr "2-factor authentication"
+
+#: ../templates/selfService/adminMain.php:533
+msgid "2-factor authentication requires PHP curl extension."
+msgstr "2-factor authentication requires PHP curl extension."
+
 #: ../lib/modules/locking389ds.inc:351
 msgid "389ds"
 msgstr "389ds"
@@ -123,24 +132,24 @@ msgstr ""
 msgid "<b>Maximum length:</b> %s characters"
 msgstr "<b>Maximum length:</b> %s characters"
 
-#: ../lib/modules/bindDLZ.inc:499
+#: ../lib/modules/bindDLZ.inc:502
 msgid "A CNAME record allows no other records."
 msgstr "A CNAME record allows no other records."
 
-#: ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:536
 msgid "A NS record allows no other records except SOA/MX/A records."
 msgstr "A NS record allows no other records except SOA/MX/A records."
 
-#: ../lib/modules/bindDLZ.inc:517
+#: ../lib/modules/bindDLZ.inc:520
 msgid "A SOA record allows no other records except NS/MX/A records."
 msgstr "A SOA record allows no other records except NS/MX/A records."
 
-#: ../lib/modules/bindDLZ.inc:518
+#: ../lib/modules/bindDLZ.inc:521
 msgid "A SOA record requires that the host name is set to \"@\"."
 msgstr "A SOA record requires that the host name is set to \"@\"."
 
 #: ../lib/modules/selfRegistration.inc:737
-#: ../lib/modules/passwordSelfReset.inc:1836
+#: ../lib/modules/passwordSelfReset.inc:1834
 msgid ""
 "A confirmation mail was sent. Please click on the link in the mail to "
 "proceed."
@@ -148,7 +157,7 @@ msgstr ""
 "A confirmation mail was sent. Please click on the link in the mail to "
 "proceed."
 
-#: ../lib/modules/device.inc:82
+#: ../lib/modules/device.inc:85
 msgid "A description for this device."
 msgstr "A description for this device."
 
@@ -164,19 +173,19 @@ msgstr "A list of attributes to display in the results (comma-separated)"
 msgid "A list of options (e.g. !authenticate)."
 msgstr "A list of options (e.g. !authenticate)."
 
-#: ../templates/massBuildAccounts.php:134
+#: ../templates/upload/massBuildAccounts.php:145
 msgid "A required column is missing in your CSV file."
 msgstr "A required column is missing in your CSV file."
 
-#: ../lib/modules/bindDLZ.inc:172 ../lib/modules/bindDLZ.inc:176
+#: ../lib/modules/bindDLZ.inc:175 ../lib/modules/bindDLZ.inc:179
 msgid "A server name for this service (e.g. \"ldap.example.com.\")."
 msgstr "A server name for this service (e.g. \"ldap.example.com.\")."
 
-#: ../lib/modules/bindDLZ.inc:164 ../lib/modules/bindDLZ.inc:168
+#: ../lib/modules/bindDLZ.inc:167 ../lib/modules/bindDLZ.inc:171
 msgid "A text value for this host."
 msgstr "A text value for this host."
 
-#: ../lib/modules/kolabUser.inc:133
+#: ../lib/modules/kolabUser.inc:136
 msgid ""
 "A user may define who is allowed to act on behalf of herself. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
@@ -200,14 +209,14 @@ msgstr "A valid newrdn attribute should be specified"
 msgid "A valid newsuperior attribute should be specified"
 msgstr "A valid newsuperior attribute should be specified"
 
-#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:105
-#: ../lib/modules/bindDLZ.inc:255 ../lib/modules/bindDLZ.inc:261
-#: ../lib/modules/bindDLZ.inc:479
+#: ../lib/modules/bindDLZ.inc:99 ../lib/modules/bindDLZ.inc:108
+#: ../lib/modules/bindDLZ.inc:258 ../lib/modules/bindDLZ.inc:264
+#: ../lib/modules/bindDLZ.inc:482
 msgid "A/AAAA record"
 msgstr "A/AAAA record"
 
-#: ../lib/modules/bindDLZ.inc:418 ../lib/modules/bindDLZ.inc:438
-#: ../lib/modules/bindDLZ.inc:1477
+#: ../lib/modules/bindDLZ.inc:421 ../lib/modules/bindDLZ.inc:441
+#: ../lib/modules/bindDLZ.inc:1478
 msgid "A/AAAA records"
 msgstr "A/AAAA records"
 
@@ -215,20 +224,20 @@ msgstr "A/AAAA records"
 #: ../lib/modules/asteriskAccount.inc:271
 #: ../lib/modules/asteriskAccount.inc:347
 #: ../lib/modules/asteriskAccount.inc:610
-#: ../lib/modules/asteriskAccount.inc:990
-#: ../lib/modules/asteriskAccount.inc:1246
+#: ../lib/modules/asteriskAccount.inc:988
+#: ../lib/modules/asteriskAccount.inc:1244
 msgid "AMA flags"
 msgstr "AMA flags"
 
-#: ../templates/serverInfo.php:342
+#: ../templates/serverInfo.php:343
 msgid "Abandon"
 msgstr "Abandon"
 
-#: ../templates/lists/changePassword.php:764
+#: ../templates/lists/changePassword.php:765
 msgid "Aborted password change."
 msgstr "Aborted password change."
 
-#: ../templates/config/confmain.php:276 ../help/help.inc:111
+#: ../templates/config/confmain.php:279 ../help/help.inc:111
 msgid "Access level"
 msgstr "Access level"
 
@@ -236,15 +245,16 @@ msgstr "Access level"
 msgid "Account"
 msgstr "Account"
 
-#: ../templates/massBuildAccounts.php:200 ../lib/modules/kolabGroup.inc:178
-#: ../lib/modules/kolabGroup.inc:180 ../lib/modules/kolabGroup.inc:182
-#: ../lib/modules/kolabGroup.inc:184 ../lib/modules/pykotaPrinter.inc:210
-#: ../lib/modules/pykotaPrinter.inc:212 ../lib/modules/pykotaPrinter.inc:214
-#: ../lib/modules/pykotaPrinter.inc:216 ../lib/modules/pykotaPrinter.inc:218
-#: ../lib/modules/pykotaPrinter.inc:219 ../lib/modules/pykotaPrinter.inc:220
-#: ../lib/modules/mitKerberos.inc:290 ../lib/modules/mitKerberos.inc:291
-#: ../lib/modules/mitKerberos.inc:292 ../lib/modules/mitKerberos.inc:294
-#: ../lib/modules/mitKerberos.inc:296 ../lib/modules/mitKerberos.inc:297
+#: ../templates/upload/massBuildAccounts.php:211
+#: ../lib/modules/kolabGroup.inc:178 ../lib/modules/kolabGroup.inc:180
+#: ../lib/modules/kolabGroup.inc:182 ../lib/modules/kolabGroup.inc:184
+#: ../lib/modules/pykotaPrinter.inc:210 ../lib/modules/pykotaPrinter.inc:212
+#: ../lib/modules/pykotaPrinter.inc:214 ../lib/modules/pykotaPrinter.inc:216
+#: ../lib/modules/pykotaPrinter.inc:218 ../lib/modules/pykotaPrinter.inc:219
+#: ../lib/modules/pykotaPrinter.inc:220 ../lib/modules/mitKerberos.inc:290
+#: ../lib/modules/mitKerberos.inc:291 ../lib/modules/mitKerberos.inc:292
+#: ../lib/modules/mitKerberos.inc:294 ../lib/modules/mitKerberos.inc:296
+#: ../lib/modules/mitKerberos.inc:297
 #: ../lib/modules/zarafaDynamicGroup.inc:197
 #: ../lib/modules/zarafaDynamicGroup.inc:199
 #: ../lib/modules/zarafaDynamicGroup.inc:201
@@ -260,9 +270,9 @@ msgstr "Account"
 #: ../lib/modules/asteriskAccount.inc:573
 #: ../lib/modules/asteriskAccount.inc:575
 #: ../lib/modules/asteriskAccount.inc:577 ../lib/modules/account.inc:125
-#: ../lib/modules/ieee802device.inc:96 ../lib/modules/puppetClient.inc:195
-#: ../lib/modules/puppetClient.inc:197 ../lib/modules/puppetClient.inc:198
+#: ../lib/modules/ieee802device.inc:96 ../lib/modules/puppetClient.inc:198
 #: ../lib/modules/puppetClient.inc:200 ../lib/modules/puppetClient.inc:201
+#: ../lib/modules/puppetClient.inc:203 ../lib/modules/puppetClient.inc:204
 #: ../lib/modules/qmailUser.inc:449 ../lib/modules/qmailUser.inc:451
 #: ../lib/modules/qmailUser.inc:453 ../lib/modules/qmailUser.inc:454
 #: ../lib/modules/qmailUser.inc:455 ../lib/modules/qmailUser.inc:457
@@ -273,12 +283,12 @@ msgstr "Account"
 #: ../lib/modules/zarafaContact.inc:208 ../lib/modules/zarafaContact.inc:209
 #: ../lib/modules/zarafaContact.inc:210 ../lib/modules/zarafaContact.inc:213
 #: ../lib/modules/zarafaContact.inc:214 ../lib/modules/windowsHost.inc:132
-#: ../lib/modules/posixGroup.inc:666 ../lib/modules/posixGroup.inc:670
-#: ../lib/modules/posixGroup.inc:671 ../lib/modules/zarafaGroup.inc:199
+#: ../lib/modules/posixGroup.inc:664 ../lib/modules/posixGroup.inc:668
+#: ../lib/modules/posixGroup.inc:669 ../lib/modules/zarafaGroup.inc:199
 #: ../lib/modules/zarafaGroup.inc:201 ../lib/modules/zarafaGroup.inc:202
 #: ../lib/modules/zarafaGroup.inc:203 ../lib/modules/zarafaGroup.inc:204
-#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/device.inc:141
-#: ../lib/modules/device.inc:142 ../lib/modules/dhcp_settings.inc:326
+#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/device.inc:144
+#: ../lib/modules/device.inc:145 ../lib/modules/dhcp_settings.inc:326
 #: ../lib/modules/dhcp_settings.inc:328 ../lib/modules/dhcp_settings.inc:330
 #: ../lib/modules/dhcp_settings.inc:332 ../lib/modules/dhcp_settings.inc:334
 #: ../lib/modules/dhcp_settings.inc:335 ../lib/modules/dhcp_settings.inc:336
@@ -287,10 +297,10 @@ msgstr "Account"
 #: ../lib/modules/eduPerson.inc:246 ../lib/modules/eduPerson.inc:248
 #: ../lib/modules/eduPerson.inc:250 ../lib/modules/eduPerson.inc:251
 #: ../lib/modules/eduPerson.inc:252 ../lib/modules/eduPerson.inc:253
-#: ../lib/modules/quota.inc:52 ../lib/modules/quota.inc:54
-#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:58
-#: ../lib/modules/quota.inc:60 ../lib/modules/quota.inc:62
-#: ../lib/modules/quota.inc:63 ../lib/modules/zarafaAddressList.inc:170
+#: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:57
+#: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:61
+#: ../lib/modules/quota.inc:63 ../lib/modules/quota.inc:65
+#: ../lib/modules/quota.inc:66 ../lib/modules/zarafaAddressList.inc:170
 #: ../lib/modules/zarafaAddressList.inc:171
 #: ../lib/modules/zarafaAddressList.inc:172 ../lib/modules/pykotaGroup.inc:198
 #: ../lib/modules/pykotaGroup.inc:200 ../lib/modules/pykotaGroup.inc:202
@@ -317,29 +327,29 @@ msgstr "Account"
 #: ../lib/modules/posixAccount.inc:123 ../lib/modules/posixAccount.inc:124
 #: ../lib/modules/posixAccount.inc:126 ../lib/modules/posixAccount.inc:127
 #: ../lib/modules/posixAccount.inc:128 ../lib/modules/posixAccount.inc:130
-#: ../lib/modules/zarafaUser.inc:431 ../lib/modules/zarafaUser.inc:433
-#: ../lib/modules/zarafaUser.inc:435 ../lib/modules/zarafaUser.inc:436
-#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:440
-#: ../lib/modules/zarafaUser.inc:442 ../lib/modules/zarafaUser.inc:443
-#: ../lib/modules/zarafaUser.inc:444 ../lib/modules/zarafaUser.inc:445
-#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:447
-#: ../lib/modules/zarafaUser.inc:448 ../lib/modules/zarafaUser.inc:449
-#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/bindDLZ.inc:478
-#: ../lib/modules/bindDLZ.inc:480 ../lib/modules/bindDLZ.inc:482
-#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:486
-#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:490
-#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:494
-#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/zarafaUser.inc:434 ../lib/modules/zarafaUser.inc:436
+#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:439
+#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/zarafaUser.inc:443
+#: ../lib/modules/zarafaUser.inc:445 ../lib/modules/zarafaUser.inc:446
+#: ../lib/modules/zarafaUser.inc:447 ../lib/modules/zarafaUser.inc:448
+#: ../lib/modules/zarafaUser.inc:449 ../lib/modules/zarafaUser.inc:450
+#: ../lib/modules/zarafaUser.inc:451 ../lib/modules/zarafaUser.inc:452
+#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/bindDLZ.inc:481
+#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:491 ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:495 ../lib/modules/bindDLZ.inc:497
 #: ../lib/modules/bindDLZ.inc:499 ../lib/modules/bindDLZ.inc:501
-#: ../lib/modules/bindDLZ.inc:503 ../lib/modules/bindDLZ.inc:505
-#: ../lib/modules/bindDLZ.inc:507 ../lib/modules/bindDLZ.inc:509
-#: ../lib/modules/bindDLZ.inc:511 ../lib/modules/bindDLZ.inc:513
-#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:516
-#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:518
-#: ../lib/modules/bindDLZ.inc:520 ../lib/modules/bindDLZ.inc:522
-#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:526
-#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:530
-#: ../lib/modules/bindDLZ.inc:532 ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:502 ../lib/modules/bindDLZ.inc:504
+#: ../lib/modules/bindDLZ.inc:506 ../lib/modules/bindDLZ.inc:508
+#: ../lib/modules/bindDLZ.inc:510 ../lib/modules/bindDLZ.inc:512
+#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:516
+#: ../lib/modules/bindDLZ.inc:518 ../lib/modules/bindDLZ.inc:519
+#: ../lib/modules/bindDLZ.inc:520 ../lib/modules/bindDLZ.inc:521
+#: ../lib/modules/bindDLZ.inc:523 ../lib/modules/bindDLZ.inc:525
+#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:529
+#: ../lib/modules/bindDLZ.inc:531 ../lib/modules/bindDLZ.inc:533
+#: ../lib/modules/bindDLZ.inc:535 ../lib/modules/bindDLZ.inc:536
 #: ../lib/modules/windowsUser.inc:951 ../lib/modules/windowsUser.inc:953
 #: ../lib/modules/windowsUser.inc:955 ../lib/modules/windowsUser.inc:957
 #: ../lib/modules/windowsUser.inc:959 ../lib/modules/windowsUser.inc:961
@@ -355,37 +365,37 @@ msgstr "Account"
 #: ../lib/modules/windowsUser.inc:1000 ../lib/modules/windowsUser.inc:1001
 #: ../lib/modules/windowsUser.inc:2120 ../lib/modules/windowsUser.inc:2129
 #: ../lib/modules/windowsUser.inc:2150 ../lib/modules/windowsUser.inc:2161
-#: ../lib/modules/windowsUser.inc:2219 ../lib/modules/kolabUser.inc:246
-#: ../lib/modules/kolabUser.inc:248 ../lib/modules/kolabUser.inc:250
-#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabUser.inc:254
-#: ../lib/modules/kolabUser.inc:256 ../lib/modules/kolabUser.inc:258
+#: ../lib/modules/windowsUser.inc:2219 ../lib/modules/kolabUser.inc:249
+#: ../lib/modules/kolabUser.inc:251 ../lib/modules/kolabUser.inc:253
+#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabUser.inc:257
+#: ../lib/modules/kolabUser.inc:259 ../lib/modules/kolabUser.inc:261
 #: ../lib/modules/ddns.inc:152 ../lib/modules/nisObject.inc:124
-#: ../lib/modules/sambaGroupMapping.inc:604
-#: ../lib/modules/sambaGroupMapping.inc:605 ../lib/modules/pykotaUser.inc:312
-#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:316
-#: ../lib/modules/pykotaUser.inc:318 ../lib/modules/pykotaUser.inc:320
+#: ../lib/modules/sambaGroupMapping.inc:602
+#: ../lib/modules/sambaGroupMapping.inc:603 ../lib/modules/pykotaUser.inc:315
+#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:319
 #: ../lib/modules/pykotaUser.inc:321 ../lib/modules/pykotaUser.inc:323
-#: ../lib/modules/pykotaUser.inc:325 ../lib/modules/shadowAccount.inc:58
+#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:328 ../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/automount.inc:115
 #: ../lib/modules/sambaDomain.inc:209 ../lib/modules/sambaDomain.inc:211
 #: ../lib/modules/sambaDomain.inc:213 ../lib/modules/sambaDomain.inc:215
 #: ../lib/modules/sambaDomain.inc:217 ../lib/modules/sambaDomain.inc:219
-#: ../lib/modules/inetOrgPerson.inc:67 ../lib/modules/inetOrgPerson.inc:69
-#: ../lib/modules/inetOrgPerson.inc:71 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:75 ../lib/modules/inetOrgPerson.inc:77
-#: ../lib/modules/inetOrgPerson.inc:79 ../lib/modules/inetOrgPerson.inc:82
-#: ../lib/modules/inetOrgPerson.inc:84 ../lib/modules/inetOrgPerson.inc:86
-#: ../lib/modules/inetOrgPerson.inc:88 ../lib/modules/inetOrgPerson.inc:90
-#: ../lib/modules/inetOrgPerson.inc:92 ../lib/modules/inetOrgPerson.inc:94
-#: ../lib/modules/inetOrgPerson.inc:96 ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/inetOrgPerson.inc:99 ../lib/modules/inetOrgPerson.inc:100
-#: ../lib/modules/inetOrgPerson.inc:106 ../lib/modules/inetOrgPerson.inc:107
-#: ../lib/modules/inetOrgPerson.inc:108 ../lib/modules/systemQuotas.inc:98
-#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:102
-#: ../lib/modules/systemQuotas.inc:104 ../lib/modules/systemQuotas.inc:106
-#: ../lib/modules/systemQuotas.inc:108 ../lib/modules/systemQuotas.inc:110
+#: ../lib/modules/inetOrgPerson.inc:65 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:69 ../lib/modules/inetOrgPerson.inc:71
+#: ../lib/modules/inetOrgPerson.inc:73 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:77 ../lib/modules/inetOrgPerson.inc:80
+#: ../lib/modules/inetOrgPerson.inc:82 ../lib/modules/inetOrgPerson.inc:84
+#: ../lib/modules/inetOrgPerson.inc:86 ../lib/modules/inetOrgPerson.inc:88
+#: ../lib/modules/inetOrgPerson.inc:90 ../lib/modules/inetOrgPerson.inc:92
+#: ../lib/modules/inetOrgPerson.inc:94 ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:98
+#: ../lib/modules/inetOrgPerson.inc:104 ../lib/modules/inetOrgPerson.inc:105
+#: ../lib/modules/inetOrgPerson.inc:106 ../lib/modules/systemQuotas.inc:101
+#: ../lib/modules/systemQuotas.inc:103 ../lib/modules/systemQuotas.inc:105
+#: ../lib/modules/systemQuotas.inc:107 ../lib/modules/systemQuotas.inc:109
+#: ../lib/modules/systemQuotas.inc:111 ../lib/modules/systemQuotas.inc:113
 #: ../lib/modules/freeRadius.inc:330 ../lib/modules/freeRadius.inc:332
 #: ../lib/modules/freeRadius.inc:334 ../lib/modules/freeRadius.inc:336
 #: ../lib/modules/freeRadius.inc:338 ../lib/modules/freeRadius.inc:340
@@ -428,9 +438,9 @@ msgstr "Account"
 #: ../lib/modules/heimdalKerberos.inc:260
 #: ../lib/modules/pykotaBillingCode.inc:128
 #: ../lib/modules/pykotaBillingCode.inc:130
-#: ../lib/modules/windowsGroup.inc:291 ../lib/modules/windowsGroup.inc:293
-#: ../lib/modules/windowsGroup.inc:294 ../lib/modules/windowsGroup.inc:295
-#: ../lib/modules/windowsGroup.inc:297 ../lib/modules/nisMailAlias.inc:126
+#: ../lib/modules/windowsGroup.inc:294 ../lib/modules/windowsGroup.inc:296
+#: ../lib/modules/windowsGroup.inc:297 ../lib/modules/windowsGroup.inc:298
+#: ../lib/modules/windowsGroup.inc:300 ../lib/modules/nisMailAlias.inc:126
 #: ../lib/modules/nisMailAlias.inc:128 ../lib/modules/hostObject.inc:111
 #, php-format
 msgid "Account %s:"
@@ -442,19 +452,19 @@ msgstr "Account %s:"
 #: ../lib/modules/asteriskAccount.inc:267
 #: ../lib/modules/asteriskAccount.inc:311
 #: ../lib/modules/asteriskAccount.inc:593
-#: ../lib/modules/asteriskAccount.inc:986
-#: ../lib/modules/asteriskExtension.inc:98
-#: ../lib/modules/asteriskExtension.inc:129
-#: ../lib/modules/asteriskExtension.inc:136
-#: ../lib/modules/asteriskExtension.inc:152
-#: ../lib/modules/asteriskExtension.inc:306
+#: ../lib/modules/asteriskAccount.inc:984
+#: ../lib/modules/asteriskExtension.inc:100
+#: ../lib/modules/asteriskExtension.inc:131
+#: ../lib/modules/asteriskExtension.inc:138
+#: ../lib/modules/asteriskExtension.inc:154
+#: ../lib/modules/asteriskExtension.inc:308
 #: ../lib/modules/asteriskExtension.inc:815
 #: ../lib/modules/asteriskVoicemail.inc:91
 #: ../lib/modules/asteriskVoicemail.inc:127
 #: ../lib/modules/asteriskVoicemail.inc:137
 #: ../lib/modules/asteriskVoicemail.inc:151
 #: ../lib/modules/asteriskVoicemail.inc:247
-#: ../lib/modules/asteriskVoicemail.inc:373
+#: ../lib/modules/asteriskVoicemail.inc:371
 msgid "Account context"
 msgstr "Account context"
 
@@ -466,7 +476,7 @@ msgstr "Account creation"
 msgid "Account creation confirmation"
 msgstr "Account creation confirmation"
 
-#: ../templates/masscreate.php:124
+#: ../templates/upload/masscreate.php:149
 msgid "Account creation via file upload"
 msgstr "Account creation via file upload"
 
@@ -474,7 +484,7 @@ msgstr "Account creation via file upload"
 msgid "Account deactivated"
 msgstr "Account deactivated"
 
-#: ../templates/lists/changePassword.php:279
+#: ../templates/lists/changePassword.php:280
 msgid "Account details"
 msgstr "Account details"
 
@@ -486,24 +496,24 @@ msgstr "Account expiration"
 #: ../lib/types/user.inc:108 ../lib/modules/mitKerberos.inc:124
 #: ../lib/modules/mitKerberos.inc:218 ../lib/modules/mitKerberos.inc:251
 #: ../lib/modules/mitKerberos.inc:385 ../lib/modules/mitKerberos.inc:635
-#: ../lib/modules/mitKerberos.inc:797 ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/mitKerberos.inc:795 ../lib/modules/sambaSamAccount.inc:346
 #: ../lib/modules/sambaSamAccount.inc:470
 #: ../lib/modules/sambaSamAccount.inc:1141
 #: ../lib/modules/sambaSamAccount.inc:1394
 #: ../lib/modules/sambaSamAccount.inc:1687 ../lib/modules/windowsUser.inc:282
 #: ../lib/modules/windowsUser.inc:286 ../lib/modules/windowsUser.inc:536
 #: ../lib/modules/windowsUser.inc:844 ../lib/modules/windowsUser.inc:1196
-#: ../lib/modules/windowsUser.inc:1569 ../lib/modules/windowsUser.inc:2473
-#: ../lib/modules/windowsUser.inc:2630 ../lib/modules/shadowAccount.inc:128
+#: ../lib/modules/windowsUser.inc:1569 ../lib/modules/windowsUser.inc:2471
+#: ../lib/modules/windowsUser.inc:2628 ../lib/modules/shadowAccount.inc:128
 #: ../lib/modules/shadowAccount.inc:170 ../lib/modules/shadowAccount.inc:193
 #: ../lib/modules/shadowAccount.inc:233 ../lib/modules/shadowAccount.inc:352
-#: ../lib/modules/shadowAccount.inc:462 ../lib/modules/shadowAccount.inc:569
+#: ../lib/modules/shadowAccount.inc:462 ../lib/modules/shadowAccount.inc:567
 #: ../lib/modules/heimdalKerberos.inc:102
 #: ../lib/modules/heimdalKerberos.inc:187
 #: ../lib/modules/heimdalKerberos.inc:219
 #: ../lib/modules/heimdalKerberos.inc:321
 #: ../lib/modules/heimdalKerberos.inc:544
-#: ../lib/modules/heimdalKerberos.inc:693
+#: ../lib/modules/heimdalKerberos.inc:691
 msgid "Account expiration date"
 msgstr "Account expiration date"
 
@@ -521,7 +531,7 @@ msgstr "Account inactive"
 #: ../lib/modules/sambaSamAccount.inc:1097
 #: ../lib/modules/sambaSamAccount.inc:1683 ../lib/modules/windowsUser.inc:210
 #: ../lib/modules/windowsUser.inc:520 ../lib/modules/windowsUser.inc:834
-#: ../lib/modules/windowsUser.inc:1188 ../lib/modules/windowsUser.inc:2467
+#: ../lib/modules/windowsUser.inc:1188 ../lib/modules/windowsUser.inc:2465
 msgid "Account is deactivated"
 msgstr "Account is deactivated"
 
@@ -531,36 +541,37 @@ msgstr "Account is deactivated"
 msgid "Account is locked"
 msgstr "Account is locked"
 
-#: ../templates/lists/changePassword.php:433
+#: ../templates/lists/changePassword.php:434
 #: ../lib/modules/locking389ds.inc:58
 msgid "Account locking"
 msgstr "Account locking"
 
-#: ../templates/delete.php:104
+#: ../templates/delete.php:110
 msgid "Account name:"
 msgstr "Account name:"
 
 #: ../lib/types/user.inc:331 ../lib/types/user.inc:787
 #: ../lib/types/user.inc:998 ../lib/modules/qmailUser.inc:211
 #: ../lib/modules/qmailUser.inc:283 ../lib/modules/qmailUser.inc:402
-#: ../lib/modules/qmailUser.inc:619 ../lib/modules/qmailUser.inc:1128
+#: ../lib/modules/qmailUser.inc:619 ../lib/modules/qmailUser.inc:1126
 msgid "Account status"
 msgstr "Account status"
 
-#: ../templates/masscreate.php:151 ../lib/modules/asteriskAccount.inc:119
+#: ../templates/upload/masscreate.php:176
+#: ../lib/modules/asteriskAccount.inc:119
 #: ../lib/modules/asteriskAccount.inc:256
 #: ../lib/modules/asteriskAccount.inc:269
 #: ../lib/modules/asteriskAccount.inc:331
 #: ../lib/modules/asteriskAccount.inc:595
-#: ../lib/modules/asteriskAccount.inc:988 ../lib/modules/customFields.inc:528
+#: ../lib/modules/asteriskAccount.inc:986 ../lib/modules/customFields.inc:528
 #: ../lib/modules/customFields.inc:570
 msgid "Account type"
 msgstr "Account type"
 
-#: ../templates/config/confmodules.php:174 ../templates/config/jobList.php:158
-#: ../templates/config/jobs.php:161 ../templates/config/confmain.php:215
-#: ../templates/config/moduleSettings.php:173
-#: ../templates/config/conftypes.php:192
+#: ../templates/config/confmodules.php:184 ../templates/config/jobList.php:158
+#: ../templates/config/jobs.php:161 ../templates/config/confmain.php:218
+#: ../templates/config/moduleSettings.php:178
+#: ../templates/config/conftypes.php:211
 msgid "Account types"
 msgstr "Account types"
 
@@ -578,17 +589,17 @@ msgstr ""
 "should be managed. The account modules define which properties (e.g. Unix "
 "and Samba) can be edited."
 
-#: ../lib/modules.inc:1345
+#: ../lib/modules.inc:1353
 msgid "Account was created successfully."
 msgstr "Account was created successfully."
 
-#: ../templates/lists/changePassword.php:794
-#: ../templates/lists/changePassword.php:901
-#: ../templates/lists/changePassword.php:951 ../lib/modules.inc:1348
+#: ../templates/lists/changePassword.php:795
+#: ../templates/lists/changePassword.php:902
+#: ../templates/lists/changePassword.php:952 ../lib/modules.inc:1356
 msgid "Account was modified successfully."
 msgstr "Account was modified successfully."
 
-#: ../lib/passwordExpirationJob.inc:472 ../help/help.inc:350
+#: ../lib/passwordExpirationJob.inc:472 ../help/help.inc:362
 msgid "Action"
 msgstr "Action"
 
@@ -596,7 +607,7 @@ msgstr "Action"
 msgid "Action type"
 msgstr "Action type"
 
-#: ../templates/lists/changePassword.php:429 ../lib/types/user.inc:449
+#: ../templates/lists/changePassword.php:430 ../lib/types/user.inc:449
 msgid "Activate"
 msgstr "Activate"
 
@@ -604,8 +615,8 @@ msgstr "Activate"
 msgid "Activate DynDNS"
 msgstr "Activate DynDNS"
 
-#: ../templates/config/confmain.php:255
-#: ../templates/selfService/adminMain.php:423
+#: ../templates/config/confmain.php:258
+#: ../templates/selfService/adminMain.php:439
 msgid "Activate TLS"
 msgstr "Activate TLS"
 
@@ -643,32 +654,32 @@ msgstr "Activating this checkbox will remove the user's home directory."
 #: ../lib/modules/zarafaDynamicGroup.inc:144
 #: ../lib/modules/zarafaDynamicGroup.inc:168
 #: ../lib/modules/zarafaDynamicGroup.inc:281
-#: ../lib/modules/zarafaDynamicGroup.inc:442 ../lib/modules/qmailUser.inc:41
+#: ../lib/modules/zarafaDynamicGroup.inc:440 ../lib/modules/qmailUser.inc:41
 #: ../lib/modules/qmailUser.inc:285 ../lib/modules/zarafaContact.inc:81
 #: ../lib/modules/zarafaContact.inc:173 ../lib/modules/zarafaContact.inc:281
 #: ../lib/modules/zarafaGroup.inc:94 ../lib/modules/zarafaGroup.inc:137
 #: ../lib/modules/zarafaGroup.inc:178 ../lib/modules/zarafaGroup.inc:292
-#: ../lib/modules/zarafaGroup.inc:639 ../lib/modules/zarafaAddressList.inc:71
+#: ../lib/modules/zarafaGroup.inc:637 ../lib/modules/zarafaAddressList.inc:71
 #: ../lib/modules/zarafaAddressList.inc:120
 #: ../lib/modules/zarafaAddressList.inc:142
 #: ../lib/modules/zarafaAddressList.inc:222
-#: ../lib/modules/zarafaAddressList.inc:341 ../lib/modules/zarafaUser.inc:98
-#: ../lib/modules/zarafaUser.inc:273 ../lib/modules/zarafaUser.inc:623
-#: ../lib/modules/zarafaUser.inc:1840 ../lib/modules/fixed_ip.inc:114
-#: ../lib/modules/fixed_ip.inc:438 ../lib/modules/fixed_ip.inc:744
+#: ../lib/modules/zarafaAddressList.inc:339 ../lib/modules/zarafaUser.inc:101
+#: ../lib/modules/zarafaUser.inc:276 ../lib/modules/zarafaUser.inc:626
+#: ../lib/modules/zarafaUser.inc:1841 ../lib/modules/fixed_ip.inc:117
+#: ../lib/modules/fixed_ip.inc:441 ../lib/modules/fixed_ip.inc:745
 msgid "Active"
 msgstr "Active"
 
-#: ../templates/config/conftypes.php:245
+#: ../templates/config/conftypes.php:264
 msgid "Active account types"
 msgstr "Active account types"
 
-#: ../templates/serverInfo.php:307 ../templates/serverInfo.php:384
-#: ../templates/multiEdit.php:130 ../templates/config/profmanage.php:258
-#: ../templates/config/conftypes.php:235
+#: ../templates/serverInfo.php:308 ../templates/serverInfo.php:385
+#: ../templates/multiEdit.php:153 ../templates/config/profmanage.php:258
+#: ../templates/config/conftypes.php:254
 #: ../templates/selfService/profManage.php:208
-#: ../templates/pdfedit/pdfpage.php:600 ../templates/pdfedit/pdfpage.php:610
-#: ../templates/pdfedit/pdfpage.php:620 ../templates/pdfedit/pdfpage.php:634
+#: ../templates/pdfedit/pdfpage.php:616 ../templates/pdfedit/pdfpage.php:626
+#: ../templates/pdfedit/pdfpage.php:636 ../templates/pdfedit/pdfpage.php:651
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1206
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1210
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:78
@@ -676,27 +687,27 @@ msgstr "Active account types"
 #: ../lib/modules/pykotaPrinter.inc:269 ../lib/modules/pykotaPrinter.inc:430
 #: ../lib/modules/nisMailAliasUser.inc:162
 #: ../lib/modules/nisMailAliasUser.inc:201
-#: ../lib/modules/nisMailAliasUser.inc:387
+#: ../lib/modules/nisMailAliasUser.inc:396
 #: ../lib/modules/zarafaContact.inc:433 ../lib/modules/zarafaGroup.inc:443
-#: ../lib/modules/device.inc:253 ../lib/modules/nisNetGroupHost.inc:133
-#: ../lib/modules/zarafaUser.inc:917 ../lib/modules/zarafaUser.inc:1503
-#: ../lib/modules/zarafaUser.inc:1534 ../lib/modules/bindDLZ.inc:675
-#: ../lib/modules/bindDLZ.inc:767 ../lib/modules/bindDLZ.inc:847
-#: ../lib/modules/bindDLZ.inc:951 ../lib/modules/bindDLZ.inc:1067
-#: ../lib/modules/bindDLZ.inc:1179 ../lib/modules/bindDLZ.inc:1275
-#: ../lib/modules/bindDLZ.inc:1389 ../lib/modules/kolabUser.inc:802
-#: ../lib/modules/kolabUser.inc:850 ../lib/modules/sambaGroupMapping.inc:392
-#: ../lib/modules/sambaGroupMapping.inc:489 ../lib/modules/pykotaUser.inc:377
-#: ../lib/modules/ldapPublicKey.inc:362 ../lib/modules/ldapPublicKey.inc:371
-#: ../lib/modules/nisNetGroupUser.inc:213 ../lib/modules/nisnetgroup.inc:282
-#: ../lib/modules/inetOrgPerson.inc:1800 ../lib/modules/sudoRole.inc:321
+#: ../lib/modules/device.inc:256 ../lib/modules/nisNetGroupHost.inc:136
+#: ../lib/modules/zarafaUser.inc:920 ../lib/modules/zarafaUser.inc:1504
+#: ../lib/modules/zarafaUser.inc:1535 ../lib/modules/bindDLZ.inc:678
+#: ../lib/modules/bindDLZ.inc:770 ../lib/modules/bindDLZ.inc:850
+#: ../lib/modules/bindDLZ.inc:954 ../lib/modules/bindDLZ.inc:1070
+#: ../lib/modules/bindDLZ.inc:1182 ../lib/modules/bindDLZ.inc:1278
+#: ../lib/modules/bindDLZ.inc:1392 ../lib/modules/kolabUser.inc:803
+#: ../lib/modules/kolabUser.inc:851 ../lib/modules/sambaGroupMapping.inc:392
+#: ../lib/modules/sambaGroupMapping.inc:489 ../lib/modules/pykotaUser.inc:380
+#: ../lib/modules/ldapPublicKey.inc:363 ../lib/modules/ldapPublicKey.inc:372
+#: ../lib/modules/nisNetGroupUser.inc:216 ../lib/modules/nisnetgroup.inc:285
+#: ../lib/modules/inetOrgPerson.inc:1798 ../lib/modules/sudoRole.inc:321
 #: ../lib/modules/sudoRole.inc:348 ../lib/modules/sudoRole.inc:375
 #: ../lib/modules/sudoRole.inc:402 ../lib/modules/sudoRole.inc:429
-#: ../lib/modules/sudoRole.inc:456 ../lib/modules/customFields.inc:1088
-#: ../lib/modules/customFields.inc:2188 ../lib/modules/customFields.inc:2205
-#: ../lib/modules/qmailGroup.inc:822 ../lib/modules/organizationalRole.inc:323
-#: ../lib/modules/fixed_ip.inc:586 ../lib/modules/windowsGroup.inc:686
-#: ../lib/modules/groupOfNames.inc:382 ../lib/modules/groupOfNames.inc:537
+#: ../lib/modules/sudoRole.inc:456 ../lib/modules/customFields.inc:1086
+#: ../lib/modules/customFields.inc:2186 ../lib/modules/customFields.inc:2203
+#: ../lib/modules/qmailGroup.inc:822 ../lib/modules/organizationalRole.inc:326
+#: ../lib/modules/fixed_ip.inc:589 ../lib/modules/windowsGroup.inc:689
+#: ../lib/modules/groupOfNames.inc:385 ../lib/modules/groupOfNames.inc:540
 msgid "Add"
 msgstr "Add"
 
@@ -729,19 +740,19 @@ msgid "Add Kerberos extension"
 msgstr "Add Kerberos extension"
 
 #: ../lib/modules/kolabGroup.inc:121 ../lib/modules/kolabGroup.inc:133
-#: ../lib/modules/kolabGroup.inc:220 ../lib/modules/kolabUser.inc:394
+#: ../lib/modules/kolabGroup.inc:220 ../lib/modules/kolabUser.inc:397
 msgid "Add Kolab extension"
 msgstr "Add Kolab extension"
 
-#: ../lib/modules/puppetClient.inc:235
+#: ../lib/modules/puppetClient.inc:238
 msgid "Add Puppet extension"
 msgstr "Add Puppet extension"
 
-#: ../lib/modules/pykotaGroup.inc:245 ../lib/modules/pykotaUser.inc:425
+#: ../lib/modules/pykotaGroup.inc:245 ../lib/modules/pykotaUser.inc:428
 msgid "Add PyKota extension"
 msgstr "Add PyKota extension"
 
-#: ../lib/modules/ldapPublicKey.inc:159
+#: ../lib/modules/ldapPublicKey.inc:162
 msgid "Add SSH public key extension"
 msgstr "Add SSH public key extension"
 
@@ -763,13 +774,13 @@ msgid "Add Zarafa contact extension"
 msgstr "Add Zarafa contact extension"
 
 #: ../lib/modules/zarafaContact.inc:116 ../lib/modules/zarafaContact.inc:117
-#: ../lib/modules/zarafaGroup.inc:302 ../lib/modules/zarafaUser.inc:181
-#: ../lib/modules/zarafaUser.inc:182 ../lib/modules/zarafaUser.inc:197
-#: ../lib/modules/zarafaUser.inc:462 ../lib/modules/zarafaServer.inc:237
+#: ../lib/modules/zarafaGroup.inc:302 ../lib/modules/zarafaUser.inc:184
+#: ../lib/modules/zarafaUser.inc:185 ../lib/modules/zarafaUser.inc:200
+#: ../lib/modules/zarafaUser.inc:465 ../lib/modules/zarafaServer.inc:237
 msgid "Add Zarafa extension"
 msgstr "Add Zarafa extension"
 
-#: ../lib/modules/inetOrgPerson.inc:880 ../lib/modules/inetOrgPerson.inc:3710
+#: ../lib/modules/inetOrgPerson.inc:878 ../lib/modules/inetOrgPerson.inc:3690
 msgid "Add addressbook (ou=addressbook)"
 msgstr "Add addressbook (ou=addressbook)"
 
@@ -786,26 +797,26 @@ msgstr "Add all"
 msgid "Add an additional value to attribute"
 msgstr "Add an additional value to attribute"
 
-#: ../lib/modules/asteriskExtension.inc:350
+#: ../lib/modules/asteriskExtension.inc:352
 msgid "Add another rule"
 msgstr "Add another rule"
 
-#: ../lib/modules/inetOrgPerson.inc:1835
-#: ../lib/modules/organizationalRole.inc:328
-#: ../lib/modules/groupOfNames.inc:387 ../lib/modules/groupOfNames.inc:542
+#: ../lib/modules/inetOrgPerson.inc:1833
+#: ../lib/modules/organizationalRole.inc:331
+#: ../lib/modules/groupOfNames.inc:390 ../lib/modules/groupOfNames.inc:545
 msgid "Add entries"
 msgstr "Add entries"
 
 #: ../lib/modules/zarafaContact.inc:472 ../lib/modules/zarafaGroup.inc:482
-#: ../lib/modules/device.inc:296 ../lib/modules/zarafaUser.inc:961
+#: ../lib/modules/device.inc:299 ../lib/modules/zarafaUser.inc:964
 #: ../lib/modules/sambaGroupMapping.inc:504 ../lib/modules/qmailGroup.inc:858
-#: ../lib/modules/organizationalRole.inc:339
-#: ../lib/modules/windowsGroup.inc:729 ../lib/modules/groupOfNames.inc:398
-#: ../lib/modules/groupOfNames.inc:553
+#: ../lib/modules/organizationalRole.inc:342
+#: ../lib/modules/windowsGroup.inc:732 ../lib/modules/groupOfNames.inc:401
+#: ../lib/modules/groupOfNames.inc:556
 msgid "Add entries of this type:"
 msgstr "Add entries of this type:"
 
-#: ../lib/modules/fixed_ip.inc:544
+#: ../lib/modules/fixed_ip.inc:547
 msgid "Add existing host"
 msgstr "Add existing host"
 
@@ -821,7 +832,7 @@ msgstr "Add fix IP addresses to DNS"
 msgid "Add host extension"
 msgstr "Add host extension"
 
-#: ../templates/selfService/adminMain.php:621 ../help/help.inc:270
+#: ../templates/selfService/adminMain.php:674 ../help/help.inc:270
 msgid "Add input field"
 msgstr "Add input field"
 
@@ -833,11 +844,11 @@ msgstr "Add job"
 msgid "Add mail routing extension"
 msgstr "Add mail routing extension"
 
-#: ../templates/multiEdit.php:152
+#: ../templates/multiEdit.php:175
 msgid "Add more fields"
 msgstr "Add more fields"
 
-#: ../lib/modules/customFields.inc:3150
+#: ../lib/modules/customFields.inc:3148
 msgid "Add more mapping fields"
 msgstr "Add more mapping fields"
 
@@ -863,11 +874,11 @@ msgstr "Add new attribute to this object"
 msgid "Add new binary attribute"
 msgstr "Add new binary attribute"
 
-#: ../lib/modules/customFields.inc:1087 ../lib/modules/customFields.inc:1088
+#: ../lib/modules/customFields.inc:1085 ../lib/modules/customFields.inc:1086
 msgid "Add new field"
 msgstr "Add new field"
 
-#: ../templates/selfService/adminMain.php:613 ../help/help.inc:268
+#: ../templates/selfService/adminMain.php:666 ../help/help.inc:268
 msgid "Add new group"
 msgstr "Add new group"
 
@@ -890,8 +901,8 @@ msgstr "Add password self reset extension"
 
 #: ../lib/modules/windowsUser.inc:294 ../lib/modules/windowsUser.inc:390
 #: ../lib/modules/windowsUser.inc:1267 ../lib/modules/windowsUser.inc:1765
-#: ../lib/modules/inetOrgPerson.inc:775 ../lib/modules/inetOrgPerson.inc:1676
-#: ../lib/modules/inetOrgPerson.inc:1759 ../lib/modules/inetOrgPerson.inc:2738
+#: ../lib/modules/inetOrgPerson.inc:773 ../lib/modules/inetOrgPerson.inc:1674
+#: ../lib/modules/inetOrgPerson.inc:1757 ../lib/modules/inetOrgPerson.inc:2734
 msgid "Add photo"
 msgstr "Add photo"
 
@@ -910,7 +921,7 @@ msgstr "Add qmail extension"
 msgid "Add selected"
 msgstr "Add selected"
 
-#: ../lib/modules/nisMailAliasUser.inc:374
+#: ../lib/modules/nisMailAliasUser.inc:383
 msgid "Add to existing alias"
 msgstr "Add to existing alias"
 
@@ -918,7 +929,7 @@ msgstr "Add to existing alias"
 msgid "Add value"
 msgstr "Add value"
 
-#: ../lib/modules/posixGroup.inc:924
+#: ../lib/modules/posixGroup.inc:922
 msgid "Added users"
 msgstr "Added users"
 
@@ -926,16 +937,16 @@ msgstr "Added users"
 msgid "Adding"
 msgstr "Adding"
 
-#: ../lib/modules/range.inc:136
+#: ../lib/modules/range.inc:139
 msgid "Adding the range failed because errors occured."
 msgstr "Adding the range failed because errors occured."
 
-#: ../templates/selfService/adminMain.php:517 ../help/help.inc:274
+#: ../templates/selfService/adminMain.php:570 ../help/help.inc:274
 msgid "Additional CSS links"
 msgstr "Additional CSS links"
 
-#: ../templates/config/conftypes.php:302
-#: ../templates/selfService/adminMain.php:447 ../help/help.inc:172
+#: ../templates/config/conftypes.php:313
+#: ../templates/selfService/adminMain.php:463 ../help/help.inc:172
 #: ../help/help.inc:278
 msgid "Additional LDAP filter"
 msgstr "Additional LDAP filter"
@@ -949,11 +960,11 @@ msgstr "Additional email addresses for this entry."
 #: ../lib/modules/posixAccount.inc:245 ../lib/modules/posixAccount.inc:356
 #: ../lib/modules/posixAccount.inc:411 ../lib/modules/posixAccount.inc:489
 #: ../lib/modules/posixAccount.inc:1438 ../lib/modules/posixAccount.inc:1729
-#: ../lib/modules/posixAccount.inc:1846
+#: ../lib/modules/posixAccount.inc:1844
 msgid "Additional groups"
 msgstr "Additional groups"
 
-#: ../lib/modules/windowsGroup.inc:125
+#: ../lib/modules/windowsGroup.inc:128
 msgid "Additional notes to describe this entry."
 msgstr "Additional notes to describe this entry."
 
@@ -961,11 +972,11 @@ msgstr "Additional notes to describe this entry."
 msgid "Additional options"
 msgstr "Additional options"
 
-#: ../templates/massDoUpload.php:160
+#: ../lib/upload.inc:234
 msgid "Additional tasks for module:"
 msgstr "Additional tasks for module:"
 
-#: ../lib/modules/windowsUser.inc:1092 ../lib/modules/inetOrgPerson.inc:1300
+#: ../lib/modules/windowsUser.inc:1092 ../lib/modules/inetOrgPerson.inc:1298
 msgid "Address"
 msgstr "Address"
 
@@ -986,7 +997,7 @@ msgstr ""
 "Adds a new group element to the list of self service options. Use this to "
 "structure the input fields."
 
-#: ../lib/modules/range.inc:114
+#: ../lib/modules/range.inc:117
 msgid "Adds a new range pool."
 msgstr "Adds a new range pool."
 
@@ -994,19 +1005,19 @@ msgstr "Adds a new range pool."
 msgid "Adds a new self service option to the selected group element."
 msgstr "Adds a new self service option to the selected group element."
 
-#: ../lib/modules/inetOrgPerson.inc:881
+#: ../lib/modules/inetOrgPerson.inc:879
 msgid "Adds an \"ou=addressbook\" subentry to each user."
 msgstr "Adds an \"ou=addressbook\" subentry to each user."
 
-#: ../lib/modules/range.inc:110
+#: ../lib/modules/range.inc:113
 msgid "Adds input fields for a new IP range."
 msgstr "Adds input fields for a new IP range."
 
-#: ../lib/modules/pykotaUser.inc:153
+#: ../lib/modules/pykotaUser.inc:156
 msgid "Adds the amount to the user's balance. You can also specify a comment."
 msgstr "Adds the amount to the user's balance. You can also specify a comment."
 
-#: ../lib/modules/kolabUser.inc:171
+#: ../lib/modules/kolabUser.inc:174
 msgid "Adds the object class \"mailrecipient\" to all user accounts."
 msgstr "Adds the object class \"mailrecipient\" to all user accounts."
 
@@ -1014,54 +1025,53 @@ msgstr "Adds the object class \"mailrecipient\" to all user accounts."
 msgid "Adds this Kolab extension."
 msgstr "Adds this Kolab extension."
 
-#: ../lib/modules/zarafaUser.inc:122 ../lib/modules/zarafaUser.inc:283
-#: ../lib/modules/zarafaUser.inc:389 ../lib/modules/zarafaUser.inc:633
-#: ../lib/modules/zarafaUser.inc:1300 ../lib/modules/zarafaUser.inc:1842
+#: ../lib/modules/zarafaUser.inc:125 ../lib/modules/zarafaUser.inc:286
+#: ../lib/modules/zarafaUser.inc:392 ../lib/modules/zarafaUser.inc:636
+#: ../lib/modules/zarafaUser.inc:1301 ../lib/modules/zarafaUser.inc:1843
 msgid "Admin"
 msgstr "Admin"
 
 #: ../lib/modules/selfRegistration.inc:61
 #: ../lib/modules/selfRegistration.inc:204
 #: ../lib/modules/passwordSelfReset.inc:108
-#: ../lib/modules/passwordSelfReset.inc:658
+#: ../lib/modules/passwordSelfReset.inc:656
 msgid "Admin DN"
 msgstr "Admin DN"
 
-#: ../lib/modules/bindDLZ.inc:231 ../lib/modules/bindDLZ.inc:351
-#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:529
-#: ../lib/modules/bindDLZ.inc:1051 ../lib/modules/bindDLZ.inc:1553
+#: ../lib/modules/bindDLZ.inc:234 ../lib/modules/bindDLZ.inc:354
+#: ../lib/modules/bindDLZ.inc:431 ../lib/modules/bindDLZ.inc:532
+#: ../lib/modules/bindDLZ.inc:1054 ../lib/modules/bindDLZ.inc:1554
 msgid "Admin email"
 msgstr "Admin email"
 
 #: ../lib/modules/selfRegistration.inc:65
 #: ../lib/modules/selfRegistration.inc:209 ../lib/modules/imapAccess.inc:483
 #: ../lib/modules/passwordSelfReset.inc:112
-#: ../lib/modules/passwordSelfReset.inc:662
+#: ../lib/modules/passwordSelfReset.inc:660
 msgid "Admin password"
 msgstr "Admin password"
 
 #: ../lib/modules/windowsUser.inc:704 ../lib/modules/windowsUser.inc:712
-#: ../lib/modules/windowsUser.inc:720 ../lib/modules/inetOrgPerson.inc:380
-#: ../lib/modules/inetOrgPerson.inc:502 ../lib/modules/inetOrgPerson.inc:510
+#: ../lib/modules/windowsUser.inc:720 ../lib/modules/inetOrgPerson.inc:378
+#: ../lib/modules/inetOrgPerson.inc:500 ../lib/modules/inetOrgPerson.inc:508
 msgid "Administration"
 msgstr "Administration"
 
 #: ../lib/modules/posixGroup.inc:469 ../lib/modules/pykotaGroup.inc:168
-#: ../lib/modules/nisnetgroup.inc:122
-#: ../lib/modules/organizationalRole.inc:125
-#: ../lib/modules/groupOfNames.inc:137
+#: ../lib/modules/nisnetgroup.inc:125
+#: ../lib/modules/organizationalRole.inc:128
+#: ../lib/modules/groupOfNames.inc:140
 msgid "Administrators group"
 msgstr "Administrators group"
 
-#: ../templates/config/confmain.php:293 ../templates/config/conftypes.php:348
-#: ../lib/modules/posixAccount.inc:1995 ../lib/modules/windowsUser.inc:3242
-#: ../lib/modules/inetOrgPerson.inc:3757
+#: ../templates/config/confmain.php:296 ../lib/modules/posixAccount.inc:1993
+#: ../lib/modules/windowsUser.inc:3240 ../lib/modules/inetOrgPerson.inc:3737
 msgid "Advanced options"
 msgstr "Advanced options"
 
 #: ../lib/modules/eduPerson.inc:105 ../lib/modules/eduPerson.inc:109
 #: ../lib/modules/eduPerson.inc:181 ../lib/modules/eduPerson.inc:225
-#: ../lib/modules/eduPerson.inc:328 ../lib/modules/eduPerson.inc:562
+#: ../lib/modules/eduPerson.inc:328 ../lib/modules/eduPerson.inc:560
 msgid "Affiliations"
 msgstr "Affiliations"
 
@@ -1088,16 +1098,16 @@ msgid "Alias is empty or invalid!"
 msgstr "Alias is empty or invalid!"
 
 #: ../lib/types/mailAlias.inc:91 ../lib/modules/nisMailAliasUser.inc:96
-#: ../lib/modules/nisMailAliasUser.inc:364 ../lib/modules/bindDLZ.inc:135
-#: ../lib/modules/bindDLZ.inc:268 ../lib/modules/bindDLZ.inc:419
-#: ../lib/modules/bindDLZ.inc:497 ../lib/modules/bindDLZ.inc:836
-#: ../lib/modules/bindDLZ.inc:1538 ../lib/modules/nisMailAlias.inc:81
+#: ../lib/modules/nisMailAliasUser.inc:373 ../lib/modules/bindDLZ.inc:138
+#: ../lib/modules/bindDLZ.inc:271 ../lib/modules/bindDLZ.inc:422
+#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:839
+#: ../lib/modules/bindDLZ.inc:1539 ../lib/modules/nisMailAlias.inc:81
 #: ../lib/modules/nisMailAlias.inc:101 ../lib/modules/nisMailAlias.inc:115
-#: ../lib/modules/nisMailAlias.inc:163 ../lib/modules/nisMailAlias.inc:475
+#: ../lib/modules/nisMailAlias.inc:163 ../lib/modules/nisMailAlias.inc:473
 msgid "Alias name"
 msgstr "Alias name"
 
-#: ../lib/modules/bindDLZ.inc:834
+#: ../lib/modules/bindDLZ.inc:837
 msgid "Alias name (\"CNAME\" record)"
 msgstr "Alias name (\"CNAME\" record)"
 
@@ -1111,8 +1121,8 @@ msgstr "Alias name is invalid."
 
 #: ../lib/modules/nisMailAliasUser.inc:100
 #: ../lib/modules/nisMailAliasUser.inc:110
-#: ../lib/modules/nisMailAliasUser.inc:382
-#: ../lib/modules/nisMailAliasUser.inc:542
+#: ../lib/modules/nisMailAliasUser.inc:391
+#: ../lib/modules/nisMailAliasUser.inc:549
 msgid "Alias names"
 msgstr "Alias names"
 
@@ -1126,7 +1136,7 @@ msgstr "Alias names with email address"
 msgid "Alias names with user name"
 msgstr "Alias names with user name"
 
-#: ../lib/modules/bindDLZ.inc:420 ../lib/modules/bindDLZ.inc:1539
+#: ../lib/modules/bindDLZ.inc:423 ../lib/modules/bindDLZ.inc:1540
 msgid "Alias timeout"
 msgstr "Alias timeout"
 
@@ -1134,35 +1144,35 @@ msgstr "Alias timeout"
 #: ../lib/modules/uidObject.inc:59 ../lib/modules/aliasEntry.inc:61
 #: ../lib/modules/aliasEntry.inc:69 ../lib/modules/aliasEntry.inc:77
 #: ../lib/modules/aliasEntry.inc:98 ../lib/modules/aliasEntry.inc:107
-#: ../lib/modules/aliasEntry.inc:231
+#: ../lib/modules/aliasEntry.inc:229
 msgid "Aliased entry"
 msgstr "Aliased entry"
 
-#: ../templates/schema/schema.php:226 ../lib/types/alias.inc:53
+#: ../templates/schema/schema.php:227 ../lib/types/alias.inc:53
 msgid "Aliases"
 msgstr "Aliases"
 
 #: ../lib/modules/nisMailAliasUser.inc:169
-#: ../lib/modules/nisMailAliasUser.inc:570
+#: ../lib/modules/nisMailAliasUser.inc:577
 msgid "Aliases for email"
 msgstr "Aliases for email"
 
 #: ../lib/modules/nisMailAliasUser.inc:139
-#: ../lib/modules/nisMailAliasUser.inc:568
+#: ../lib/modules/nisMailAliasUser.inc:575
 msgid "Aliases for user name"
 msgstr "Aliases for user name"
 
-#: ../lib/lists.inc:720
+#: ../lib/lists.inc:722
 #, php-format
 msgid "All accounts (%s)"
 msgstr "All accounts (%s)"
 
-#: ../templates/selfService/selfServiceMain.php:433
-#: ../templates/initsuff.php:162
+#: ../templates/selfService/selfServiceMain.php:442
+#: ../templates/initsuff.php:163
 msgid "All changes were successful."
 msgstr "All changes were successful."
 
-#: ../lib/lists.inc:719
+#: ../lib/lists.inc:721
 #, php-format
 msgid "All selected accounts (%s)"
 msgstr "All selected accounts (%s)"
@@ -1171,44 +1181,44 @@ msgstr "All selected accounts (%s)"
 msgid "Allow"
 msgstr "Allow"
 
-#: ../templates/config/confmain.php:439 ../help/help.inc:297
+#: ../templates/config/confmain.php:442 ../help/help.inc:309
 msgid "Allow alternate address"
 msgstr "Allow alternate address"
 
 #: ../lib/modules/passwordSelfReset.inc:168
 #: ../lib/modules/passwordSelfReset.inc:299
-#: ../lib/modules/passwordSelfReset.inc:669
+#: ../lib/modules/passwordSelfReset.inc:667
 msgid "Allow custom security questions"
 msgstr "Allow custom security questions"
 
 #: ../lib/modules/sambaDomain.inc:117 ../lib/modules/sambaDomain.inc:194
-#: ../lib/modules/sambaDomain.inc:308 ../lib/modules/sambaDomain.inc:627
+#: ../lib/modules/sambaDomain.inc:308 ../lib/modules/sambaDomain.inc:625
 msgid "Allow machine password changes"
 msgstr "Allow machine password changes"
 
 #: ../lib/modules/customFields.inc:148 ../lib/modules/customFields.inc:152
-#: ../lib/modules/customFields.inc:3336
+#: ../lib/modules/customFields.inc:3334
 msgid "Allow multiple values"
 msgstr "Allow multiple values"
 
 #: ../lib/types/ppolicyType.inc:90 ../lib/modules/ppolicy.inc:132
 #: ../lib/modules/ppolicy.inc:155 ../lib/modules/ppolicy.inc:289
-#: ../lib/modules/ppolicy.inc:506
+#: ../lib/modules/ppolicy.inc:504
 msgid "Allow password change"
 msgstr "Allow password change"
 
-#: ../templates/config/confmain.php:386 ../help/help.inc:206
+#: ../templates/config/confmain.php:389 ../help/help.inc:206
 msgid "Allow setting specific passwords"
 msgstr "Allow setting specific passwords"
 
 #: ../lib/modules/sambaSamAccount.inc:230
 #: ../lib/modules/sambaSamAccount.inc:352
 #: ../lib/modules/sambaSamAccount.inc:1445
-#: ../lib/modules/sambaSamAccount.inc:1930
+#: ../lib/modules/sambaSamAccount.inc:1928
 msgid "Allow terminal server login"
 msgstr "Allow terminal server login"
 
-#: ../templates/config/confmain.php:394 ../help/help.inc:208
+#: ../templates/config/confmain.php:397 ../help/help.inc:208
 msgid "Allow to display password on screen"
 msgstr "Allow to display password on screen"
 
@@ -1216,7 +1226,7 @@ msgstr "Allow to display password on screen"
 msgid "Allow to enter custom security questions."
 msgstr "Allow to enter custom security questions."
 
-#: ../templates/selfService/adminMain.php:579
+#: ../templates/selfService/adminMain.php:632
 msgid "Allow user input for this field."
 msgstr "Allow user input for this field."
 
@@ -1224,8 +1234,8 @@ msgstr "Allow user input for this field."
 #: ../lib/modules/asteriskAccount.inc:289
 #: ../lib/modules/asteriskAccount.inc:479
 #: ../lib/modules/asteriskAccount.inc:713
-#: ../lib/modules/asteriskAccount.inc:1008
-#: ../lib/modules/asteriskAccount.inc:1282
+#: ../lib/modules/asteriskAccount.inc:1006
+#: ../lib/modules/asteriskAccount.inc:1280
 msgid "Allowed codec"
 msgstr "Allowed codec"
 
@@ -1241,34 +1251,34 @@ msgstr "Allowed hosts (self service)"
 #: ../lib/modules/kolabGroup.inc:95 ../lib/modules/kolabGroup.inc:99
 #: ../lib/modules/kolabGroup.inc:141 ../lib/modules/kolabGroup.inc:164
 #: ../lib/modules/kolabGroup.inc:181 ../lib/modules/kolabGroup.inc:205
-#: ../lib/modules/kolabGroup.inc:401 ../lib/modules/kolabUser.inc:152
-#: ../lib/modules/kolabUser.inc:156 ../lib/modules/kolabUser.inc:217
-#: ../lib/modules/kolabUser.inc:235 ../lib/modules/kolabUser.inc:253
-#: ../lib/modules/kolabUser.inc:381 ../lib/modules/kolabUser.inc:733
+#: ../lib/modules/kolabGroup.inc:399 ../lib/modules/kolabUser.inc:155
+#: ../lib/modules/kolabUser.inc:159 ../lib/modules/kolabUser.inc:220
+#: ../lib/modules/kolabUser.inc:238 ../lib/modules/kolabUser.inc:256
+#: ../lib/modules/kolabUser.inc:384 ../lib/modules/kolabUser.inc:734
 #: ../lib/modules/kolabSharedFolder.inc:120
 #: ../lib/modules/kolabSharedFolder.inc:124
 #: ../lib/modules/kolabSharedFolder.inc:208
 #: ../lib/modules/kolabSharedFolder.inc:234
 #: ../lib/modules/kolabSharedFolder.inc:250
 #: ../lib/modules/kolabSharedFolder.inc:307
-#: ../lib/modules/kolabSharedFolder.inc:524
+#: ../lib/modules/kolabSharedFolder.inc:522
 msgid "Allowed recipients"
 msgstr "Allowed recipients"
 
 #: ../lib/modules/kolabGroup.inc:104 ../lib/modules/kolabGroup.inc:108
 #: ../lib/modules/kolabGroup.inc:147 ../lib/modules/kolabGroup.inc:165
 #: ../lib/modules/kolabGroup.inc:183 ../lib/modules/kolabGroup.inc:207
-#: ../lib/modules/kolabGroup.inc:402 ../lib/modules/kolabUser.inc:161
-#: ../lib/modules/kolabUser.inc:165 ../lib/modules/kolabUser.inc:223
-#: ../lib/modules/kolabUser.inc:236 ../lib/modules/kolabUser.inc:255
-#: ../lib/modules/kolabUser.inc:383 ../lib/modules/kolabUser.inc:734
+#: ../lib/modules/kolabGroup.inc:400 ../lib/modules/kolabUser.inc:164
+#: ../lib/modules/kolabUser.inc:168 ../lib/modules/kolabUser.inc:226
+#: ../lib/modules/kolabUser.inc:239 ../lib/modules/kolabUser.inc:258
+#: ../lib/modules/kolabUser.inc:386 ../lib/modules/kolabUser.inc:735
 #: ../lib/modules/kolabSharedFolder.inc:129
 #: ../lib/modules/kolabSharedFolder.inc:133
 #: ../lib/modules/kolabSharedFolder.inc:214
 #: ../lib/modules/kolabSharedFolder.inc:235
 #: ../lib/modules/kolabSharedFolder.inc:252
 #: ../lib/modules/kolabSharedFolder.inc:309
-#: ../lib/modules/kolabSharedFolder.inc:525
+#: ../lib/modules/kolabSharedFolder.inc:523
 msgid "Allowed senders"
 msgstr "Allowed senders"
 
@@ -1293,31 +1303,31 @@ msgstr "Allows to select multiple values from the list."
 msgid "Allows to set a specific password via input field."
 msgstr "Allows to set a specific password via input field."
 
-#: ../templates/lists/changePassword.php:347
-#: ../templates/lists/changePassword.php:385 ../lib/modules/qmailUser.inc:203
+#: ../templates/lists/changePassword.php:348
+#: ../templates/lists/changePassword.php:386 ../lib/modules/qmailUser.inc:203
 #: ../lib/modules/qmailUser.inc:271 ../lib/modules/qmailUser.inc:400
 #: ../lib/modules/qmailUser.inc:450 ../lib/modules/qmailUser.inc:530
-#: ../lib/modules/qmailUser.inc:1111 ../lib/modules/qmailGroup.inc:131
+#: ../lib/modules/qmailUser.inc:1109 ../lib/modules/qmailGroup.inc:131
 #: ../lib/modules/qmailGroup.inc:135 ../lib/modules/qmailGroup.inc:247
 #: ../lib/modules/qmailGroup.inc:370 ../lib/modules/qmailGroup.inc:422
-#: ../lib/modules/qmailGroup.inc:484 ../lib/modules/qmailGroup.inc:1007
+#: ../lib/modules/qmailGroup.inc:484 ../lib/modules/qmailGroup.inc:1005
 msgid "Alternate address"
 msgstr "Alternate address"
 
-#: ../lib/modules.inc:1103 ../lib/modules.inc:1202 ../help/help.inc:252
+#: ../lib/modules.inc:1111 ../lib/modules.inc:1210 ../help/help.inc:252
 msgid "Alternate recipient"
 msgstr "Alternate recipient"
 
-#: ../lib/modules/kolabUser.inc:50
+#: ../lib/modules/kolabUser.inc:53
 msgid "Always accept"
 msgstr "Always accept"
 
-#: ../lib/modules/kolabUser.inc:51
+#: ../lib/modules/kolabUser.inc:54
 msgid "Always reject"
 msgstr "Always reject"
 
-#: ../lib/modules/pykotaUser.inc:372 ../lib/modules/pykotaUser.inc:597
-#: ../lib/modules/pykotaUser.inc:910 ../lib/modules/pykotaUser.inc:970
+#: ../lib/modules/pykotaUser.inc:375 ../lib/modules/pykotaUser.inc:600
+#: ../lib/modules/pykotaUser.inc:911 ../lib/modules/pykotaUser.inc:971
 msgid "Amount"
 msgstr "Amount"
 
@@ -1344,13 +1354,13 @@ msgstr ""
 #: ../lib/modules/passwordSelfReset.inc:323
 #: ../lib/modules/passwordSelfReset.inc:327
 #: ../lib/modules/passwordSelfReset.inc:330
-#: ../lib/modules/passwordSelfReset.inc:506
-#: ../lib/modules/passwordSelfReset.inc:509
-#: ../lib/modules/passwordSelfReset.inc:512
+#: ../lib/modules/passwordSelfReset.inc:504
+#: ../lib/modules/passwordSelfReset.inc:507
+#: ../lib/modules/passwordSelfReset.inc:510
+#: ../lib/modules/passwordSelfReset.inc:819
+#: ../lib/modules/passwordSelfReset.inc:820
 #: ../lib/modules/passwordSelfReset.inc:821
-#: ../lib/modules/passwordSelfReset.inc:822
-#: ../lib/modules/passwordSelfReset.inc:823
-#: ../lib/modules/passwordSelfReset.inc:1264
+#: ../lib/modules/passwordSelfReset.inc:1262
 msgid "Answer"
 msgstr "Answer"
 
@@ -1362,8 +1372,8 @@ msgstr "Any secondary mobile numbers."
 msgid "Any secondary pager numbers."
 msgstr "Any secondary pager numbers."
 
-#: ../lib/modules/kolabUser.inc:331 ../lib/modules/kolabUser.inc:719
-#: ../lib/modules/kolabUser.inc:825 ../lib/modules/kolabUser.inc:828
+#: ../lib/modules/kolabUser.inc:334 ../lib/modules/kolabUser.inc:720
+#: ../lib/modules/kolabUser.inc:826 ../lib/modules/kolabUser.inc:829
 msgid "Anyone"
 msgstr "Anyone"
 
@@ -1371,33 +1381,33 @@ msgstr "Anyone"
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../lib/modules/asteriskExtension.inc:110
-#: ../lib/modules/asteriskExtension.inc:165
-#: ../lib/modules/asteriskExtension.inc:366
+#: ../lib/modules/asteriskExtension.inc:112
+#: ../lib/modules/asteriskExtension.inc:167
+#: ../lib/modules/asteriskExtension.inc:368
 #: ../lib/modules/asteriskExtension.inc:823
 msgid "Application"
 msgstr "Application"
 
-#: ../lib/modules/asteriskExtension.inc:94
-#: ../lib/modules/asteriskExtension.inc:172
-#: ../lib/modules/asteriskExtension.inc:374
+#: ../lib/modules/asteriskExtension.inc:96
+#: ../lib/modules/asteriskExtension.inc:174
+#: ../lib/modules/asteriskExtension.inc:376
 #: ../lib/modules/asteriskExtension.inc:824
 msgid "Application data"
 msgstr "Application data"
 
-#: ../templates/multiEdit.php:170
+#: ../templates/multiEdit.php:193
 msgid "Apply changes"
 msgstr "Apply changes"
 
-#: ../lib/modules/zarafaUser.inc:173 ../lib/modules/zarafaUser.inc:177
-#: ../lib/modules/zarafaUser.inc:335 ../lib/modules/zarafaUser.inc:401
-#: ../lib/modules/zarafaUser.inc:583 ../lib/modules/zarafaUser.inc:1005
-#: ../lib/modules/zarafaUser.inc:1274 ../lib/modules/zarafaUser.inc:1358
-#: ../lib/modules/zarafaUser.inc:1844
+#: ../lib/modules/zarafaUser.inc:176 ../lib/modules/zarafaUser.inc:180
+#: ../lib/modules/zarafaUser.inc:338 ../lib/modules/zarafaUser.inc:404
+#: ../lib/modules/zarafaUser.inc:586 ../lib/modules/zarafaUser.inc:1008
+#: ../lib/modules/zarafaUser.inc:1275 ../lib/modules/zarafaUser.inc:1359
+#: ../lib/modules/zarafaUser.inc:1845
 msgid "Archive servers"
 msgstr "Archive servers"
 
-#: ../lib/modules/zarafaUser.inc:581
+#: ../lib/modules/zarafaUser.inc:584
 msgid "Archiving"
 msgstr "Archiving"
 
@@ -1416,7 +1426,7 @@ msgstr "Ask"
 
 #: ../lib/modules/eduPerson.inc:142 ../lib/modules/eduPerson.inc:146
 #: ../lib/modules/eduPerson.inc:218 ../lib/modules/eduPerson.inc:234
-#: ../lib/modules/eduPerson.inc:352 ../lib/modules/eduPerson.inc:567
+#: ../lib/modules/eduPerson.inc:352 ../lib/modules/eduPerson.inc:565
 msgid "Assurance profiles"
 msgstr "Assurance profiles"
 
@@ -1436,7 +1446,7 @@ msgstr "Asterisk"
 msgid "Asterisk AMA (Automated Message Accounting) flags."
 msgstr "Asterisk AMA (Automated Message Accounting) flags."
 
-#: ../lib/modules/asteriskExtension.inc:79
+#: ../lib/modules/asteriskExtension.inc:81
 msgid "Asterisk extension"
 msgstr "Asterisk extension"
 
@@ -1450,7 +1460,7 @@ msgstr "Asterisk extensions entries"
 
 #: ../lib/modules/asteriskAccount.inc:123
 #: ../lib/modules/asteriskAccount.inc:249
-#: ../lib/modules/asteriskAccount.inc:1236
+#: ../lib/modules/asteriskAccount.inc:1234
 msgid "Asterisk realm"
 msgstr "Asterisk realm"
 
@@ -1480,8 +1490,8 @@ msgstr "Attribute"
 msgid "Attribute doesn't exist"
 msgstr "Attribute doesn't exist"
 
-#: ../templates/multiEdit.php:123 ../lib/modules/customFields.inc:92
-#: ../lib/modules/customFields.inc:1065 ../lib/modules/customFields.inc:1734
+#: ../templates/multiEdit.php:146 ../lib/modules/customFields.inc:92
+#: ../lib/modules/customFields.inc:1063 ../lib/modules/customFields.inc:1732
 msgid "Attribute name"
 msgstr "Attribute name"
 
@@ -1493,7 +1503,7 @@ msgstr "Attribute not available"
 msgid "Attribute not valid"
 msgstr "Attribute not valid"
 
-#: ../templates/schema/schema.php:69 ../templates/schema/schema.php:70
+#: ../templates/schema/schema.php:70 ../templates/schema/schema.php:71
 msgid "Attribute types"
 msgstr "Attribute types"
 
@@ -1514,7 +1524,7 @@ msgstr ""
 msgid "Authentication user for outbound proxies."
 msgstr "Authentication user for outbound proxies."
 
-#: ../lib/modules/bindDLZ.inc:1020
+#: ../lib/modules/bindDLZ.inc:1023
 msgid "Authoritative information (\"SOA\" record)"
 msgstr "Authoritative information (\"SOA\" record)"
 
@@ -1525,7 +1535,7 @@ msgstr "Authoritative information (\"SOA\" record)"
 #: ../lib/modules/authorizedServiceObject.inc:112
 #: ../lib/modules/authorizedServiceObject.inc:116
 #: ../lib/modules/authorizedServiceObject.inc:168
-#: ../lib/modules/authorizedServiceObject.inc:232
+#: ../lib/modules/authorizedServiceObject.inc:230
 msgid "Authorized Services"
 msgstr "Authorized Services"
 
@@ -1533,11 +1543,11 @@ msgstr "Authorized Services"
 msgid "Authorized services are invalid."
 msgstr "Authorized services are invalid."
 
-#: ../lib/modules/customFields.inc:156 ../lib/modules/customFields.inc:1953
+#: ../lib/modules/customFields.inc:156 ../lib/modules/customFields.inc:1951
 msgid "Auto-completion"
 msgstr "Auto-completion"
 
-#: ../lib/modules/bindDLZ.inc:239 ../lib/modules/bindDLZ.inc:2536
+#: ../lib/modules/bindDLZ.inc:242 ../lib/modules/bindDLZ.inc:2537
 msgid "Automatic PTR changes"
 msgstr "Automatic PTR changes"
 
@@ -1546,21 +1556,21 @@ msgid "Automatical scripts"
 msgstr "Automatical scripts"
 
 #: ../lib/modules/kolabGroup.inc:117 ../lib/modules/kolabGroup.inc:127
-#: ../lib/modules/puppetClient.inc:113 ../lib/modules/puppetClient.inc:170
+#: ../lib/modules/puppetClient.inc:116 ../lib/modules/puppetClient.inc:173
 #: ../lib/modules/qmailUser.inc:131 ../lib/modules/qmailUser.inc:263
-#: ../lib/modules/zarafaContact.inc:93 ../lib/modules/zarafaContact.inc:635
+#: ../lib/modules/zarafaContact.inc:93 ../lib/modules/zarafaContact.inc:633
 #: ../lib/modules/posixGroup.inc:411 ../lib/modules/posixGroup.inc:538
 #: ../lib/modules/eduPerson.inc:150 ../lib/modules/eduPerson.inc:155
 #: ../lib/modules/pykotaGroup.inc:129 ../lib/modules/pykotaGroup.inc:140
 #: ../lib/modules/sambaSamAccount.inc:165
 #: ../lib/modules/sambaSamAccount.inc:403 ../lib/modules/posixAccount.inc:373
-#: ../lib/modules/posixAccount.inc:1776 ../lib/modules/zarafaUser.inc:150
-#: ../lib/modules/zarafaUser.inc:1344 ../lib/modules/pykotaUser.inc:160
-#: ../lib/modules/pykotaUser.inc:173 ../lib/modules/shadowAccount.inc:106
-#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/ldapPublicKey.inc:95
-#: ../lib/modules/ldapPublicKey.inc:101
+#: ../lib/modules/posixAccount.inc:1776 ../lib/modules/zarafaUser.inc:153
+#: ../lib/modules/zarafaUser.inc:1345 ../lib/modules/pykotaUser.inc:163
+#: ../lib/modules/pykotaUser.inc:176 ../lib/modules/shadowAccount.inc:106
+#: ../lib/modules/shadowAccount.inc:197 ../lib/modules/ldapPublicKey.inc:98
+#: ../lib/modules/ldapPublicKey.inc:104
 #: ../lib/modules/inetLocalMailRecipient.inc:96
-#: ../lib/modules/customFields.inc:861 ../lib/modules/qmailGroup.inc:101
+#: ../lib/modules/customFields.inc:859 ../lib/modules/qmailGroup.inc:101
 #: ../lib/modules/qmailGroup.inc:232
 #: ../lib/modules/authorizedServiceObject.inc:89
 #: ../lib/modules/authorizedServiceObject.inc:117
@@ -1570,7 +1580,7 @@ msgstr "Automatical scripts"
 msgid "Automatically add this extension"
 msgstr "Automatically add this extension"
 
-#: ../lib/modules/bindDLZ.inc:240
+#: ../lib/modules/bindDLZ.inc:243
 msgid ""
 "Automatically adds and removes PTR entries when A/AAAA records are created "
 "or deleted."
@@ -1585,7 +1595,7 @@ msgstr "Automount entries"
 #: ../lib/types/automountType.inc:87 ../lib/modules/automount.inc:50
 #: ../lib/modules/automount.inc:68 ../lib/modules/automount.inc:88
 #: ../lib/modules/automount.inc:104 ../lib/modules/automount.inc:114
-#: ../lib/modules/automount.inc:131 ../lib/modules/automount.inc:185
+#: ../lib/modules/automount.inc:131 ../lib/modules/automount.inc:183
 msgid "Automount entry"
 msgstr "Automount entry"
 
@@ -1597,7 +1607,7 @@ msgstr ""
 "Automount entry contains invalid characters. Only ASCII characters are "
 "allowed."
 
-#: ../lib/types/automountType.inc:215
+#: ../lib/types/automountType.inc:192
 #, php-format
 msgid "Automount entry count: %s"
 msgstr "Automount entry count: %s"
@@ -1608,11 +1618,11 @@ msgstr "Autoreply"
 
 #: ../lib/modules/qmailUser.inc:116 ../lib/modules/qmailUser.inc:239
 #: ../lib/modules/qmailUser.inc:350 ../lib/modules/qmailUser.inc:424
-#: ../lib/modules/qmailUser.inc:649 ../lib/modules/qmailUser.inc:1118
+#: ../lib/modules/qmailUser.inc:649 ../lib/modules/qmailUser.inc:1116
 msgid "Autoreply text"
 msgstr "Autoreply text"
 
-#: ../templates/config/conftypes.php:227 ../lib/modules/customScripts.inc:61
+#: ../templates/config/conftypes.php:246 ../lib/modules/customScripts.inc:61
 msgid "Available account types"
 msgstr "Available account types"
 
@@ -1621,8 +1631,8 @@ msgid "Available actions"
 msgstr "Available actions"
 
 #: ../lib/modules/posixAccount.inc:1561 ../lib/modules/posixAccount.inc:1594
-#: ../lib/modules/windowsUser.inc:1686 ../lib/modules/nisnetgroup.inc:386
-#: ../lib/modules/groupOfNamesUser.inc:133 ../lib/modules/windowsGroup.inc:523
+#: ../lib/modules/windowsUser.inc:1686 ../lib/modules/nisnetgroup.inc:389
+#: ../lib/modules/groupOfNamesUser.inc:133 ../lib/modules/windowsGroup.inc:526
 msgid "Available groups"
 msgstr "Available groups"
 
@@ -1630,7 +1640,7 @@ msgstr "Available groups"
 msgid "Available members"
 msgstr "Available members"
 
-#: ../templates/config/confmodules.php:308
+#: ../templates/config/confmodules.php:314
 msgid "Available modules"
 msgstr "Available modules"
 
@@ -1638,7 +1648,7 @@ msgstr "Available modules"
 msgid "Available roles"
 msgstr "Available roles"
 
-#: ../lib/modules/posixGroup.inc:299 ../lib/modules/asteriskExtension.inc:463
+#: ../lib/modules/posixGroup.inc:299 ../lib/modules/asteriskExtension.inc:465
 msgid "Available users"
 msgstr "Available users"
 
@@ -1651,27 +1661,28 @@ msgid "B-Node (0x01)"
 msgstr "B-Node (0x01)"
 
 #: ../lib/passwordExpirationJob.inc:84 ../lib/passwordExpirationJob.inc:137
-#: ../help/help.inc:342
+#: ../help/help.inc:354
 msgid "BCC address"
 msgstr "BCC address"
 
-#: ../templates/config/jobList.php:241 ../templates/massBuildAccounts.php:276
+#: ../templates/config/jobList.php:241
+#: ../templates/upload/massBuildAccounts.php:286
 #: ../lib/modules/zarafaContact.inc:479 ../lib/modules/posixGroup.inc:357
-#: ../lib/modules/zarafaGroup.inc:489 ../lib/modules/device.inc:303
+#: ../lib/modules/zarafaGroup.inc:489 ../lib/modules/device.inc:306
 #: ../lib/modules/sambaSamAccount.inc:1309
 #: ../lib/modules/sambaSamAccount.inc:1587
 #: ../lib/modules/posixAccount.inc:1634 ../lib/modules/posixAccount.inc:1708
-#: ../lib/modules/zarafaUser.inc:968 ../lib/modules/zarafaUser.inc:1017
+#: ../lib/modules/zarafaUser.inc:971 ../lib/modules/zarafaUser.inc:1020
 #: ../lib/modules/windowsUser.inc:1729 ../lib/modules/windowsUser.inc:1766
-#: ../lib/modules/sambaGroupMapping.inc:511 ../lib/modules/pykotaUser.inc:618
-#: ../lib/modules/pykotaUser.inc:675 ../lib/modules/nisnetgroup.inc:400
-#: ../lib/modules/inetOrgPerson.inc:1760 ../lib/modules/inetOrgPerson.inc:1836
-#: ../lib/modules/inetOrgPerson.inc:1926 ../lib/modules/qmailGroup.inc:865
-#: ../lib/modules/organizationalRole.inc:395
-#: ../lib/modules/organizationalRole.inc:457
-#: ../lib/modules/windowsGroup.inc:569 ../lib/modules/windowsGroup.inc:736
-#: ../lib/modules/windowsGroup.inc:793 ../lib/modules/groupOfNames.inc:455
-#: ../lib/modules/groupOfNames.inc:609 ../lib/modules/groupOfNames.inc:679
+#: ../lib/modules/sambaGroupMapping.inc:511 ../lib/modules/pykotaUser.inc:621
+#: ../lib/modules/pykotaUser.inc:678 ../lib/modules/nisnetgroup.inc:403
+#: ../lib/modules/inetOrgPerson.inc:1758 ../lib/modules/inetOrgPerson.inc:1834
+#: ../lib/modules/inetOrgPerson.inc:1924 ../lib/modules/qmailGroup.inc:865
+#: ../lib/modules/organizationalRole.inc:398
+#: ../lib/modules/organizationalRole.inc:460
+#: ../lib/modules/windowsGroup.inc:572 ../lib/modules/windowsGroup.inc:739
+#: ../lib/modules/windowsGroup.inc:796 ../lib/modules/groupOfNames.inc:458
+#: ../lib/modules/groupOfNames.inc:612 ../lib/modules/groupOfNames.inc:682
 msgid "Back"
 msgstr "Back"
 
@@ -1719,7 +1730,7 @@ msgstr "Back to domain list"
 msgid "Back to extensions list"
 msgstr "Back to extensions list"
 
-#: ../templates/lists/userlink.php:63 ../lib/types/gon.inc:44
+#: ../templates/lists/userlink.php:64 ../lib/types/gon.inc:44
 #: ../lib/types/zarafaDynamicGroupType.inc:44 ../lib/types/group.inc:45
 #: ../lib/types/netgroup.inc:44
 msgid "Back to group list"
@@ -1729,12 +1740,12 @@ msgstr "Back to group list"
 msgid "Back to host list"
 msgstr "Back to host list"
 
-#: ../templates/delete.php:299
+#: ../templates/delete.php:307
 msgid "Back to list"
 msgstr "Back to list"
 
 #: ../templates/config/index.php:145 ../templates/config/conflogin.php:207
-#: ../templates/config/mainlogin.php:184
+#: ../templates/config/mainlogin.php:198
 #: ../templates/selfService/selfServiceSP.php:141
 #: ../templates/selfService/adminLogin.php:196
 msgid "Back to login"
@@ -1777,19 +1788,19 @@ msgstr "Back to view list"
 msgid "Back up"
 msgstr "Back up"
 
-#: ../templates/serverInfo.php:163
+#: ../templates/serverInfo.php:164
 msgid "Backends"
 msgstr "Backends"
 
-#: ../templates/lists/changePassword.php:290
+#: ../templates/lists/changePassword.php:291
 #: ../lib/modules/passwordSelfReset.inc:92
 #: ../lib/modules/passwordSelfReset.inc:238
 #: ../lib/modules/passwordSelfReset.inc:256
 #: ../lib/modules/passwordSelfReset.inc:266
 #: ../lib/modules/passwordSelfReset.inc:306
 #: ../lib/modules/passwordSelfReset.inc:368
-#: ../lib/modules/passwordSelfReset.inc:515
-#: ../lib/modules/passwordSelfReset.inc:846
+#: ../lib/modules/passwordSelfReset.inc:513
+#: ../lib/modules/passwordSelfReset.inc:844
 msgid "Backup email"
 msgstr "Backup email"
 
@@ -1806,22 +1817,22 @@ msgid "Backup script"
 msgstr "Backup script"
 
 #: ../lib/types/pykotaBillingCodeType.inc:93 ../lib/modules/pykotaGroup.inc:62
-#: ../lib/modules/pykotaUser.inc:62 ../lib/modules/pykotaUser.inc:132
-#: ../lib/modules/pykotaUser.inc:170 ../lib/modules/pykotaUser.inc:241
-#: ../lib/modules/pykotaUser.inc:262 ../lib/modules/pykotaUser.inc:322
-#: ../lib/modules/pykotaUser.inc:365 ../lib/modules/pykotaUser.inc:903
-#: ../lib/modules/pykotaUser.inc:953 ../lib/modules/pykotaBillingCode.inc:85
+#: ../lib/modules/pykotaUser.inc:65 ../lib/modules/pykotaUser.inc:135
+#: ../lib/modules/pykotaUser.inc:173 ../lib/modules/pykotaUser.inc:244
+#: ../lib/modules/pykotaUser.inc:265 ../lib/modules/pykotaUser.inc:325
+#: ../lib/modules/pykotaUser.inc:368 ../lib/modules/pykotaUser.inc:904
+#: ../lib/modules/pykotaUser.inc:954 ../lib/modules/pykotaBillingCode.inc:85
 #: ../lib/modules/pykotaBillingCode.inc:117
 #: ../lib/modules/pykotaBillingCode.inc:143
-#: ../lib/modules/pykotaBillingCode.inc:266
+#: ../lib/modules/pykotaBillingCode.inc:264
 msgid "Balance"
 msgstr "Balance"
 
-#: ../lib/modules/pykotaUser.inc:281
+#: ../lib/modules/pykotaUser.inc:284
 msgid "Balance (read-only)"
 msgstr "Balance (read-only)"
 
-#: ../lib/modules/pykotaUser.inc:136 ../lib/modules/pykotaUser.inc:247
+#: ../lib/modules/pykotaUser.inc:139 ../lib/modules/pykotaUser.inc:250
 msgid "Balance comment"
 msgstr "Balance comment"
 
@@ -1833,14 +1844,14 @@ msgstr "Balance comment"
 #: ../lib/modules/zarafaDynamicGroup.inc:170
 #: ../lib/modules/zarafaDynamicGroup.inc:198
 #: ../lib/modules/zarafaDynamicGroup.inc:231
-#: ../lib/modules/zarafaDynamicGroup.inc:435
+#: ../lib/modules/zarafaDynamicGroup.inc:433
 #: ../lib/modules/zarafaAddressList.inc:75
 #: ../lib/modules/zarafaAddressList.inc:89
 #: ../lib/modules/zarafaAddressList.inc:128
 #: ../lib/modules/zarafaAddressList.inc:144
 #: ../lib/modules/zarafaAddressList.inc:169
 #: ../lib/modules/zarafaAddressList.inc:198
-#: ../lib/modules/zarafaAddressList.inc:335
+#: ../lib/modules/zarafaAddressList.inc:333
 msgid "Base"
 msgstr "Base"
 
@@ -1855,21 +1866,22 @@ msgstr "Base (base dn only)"
 msgid "Base DN"
 msgstr "Base DN"
 
-#: ../templates/config/confmodules.php:224 ../help/help.inc:146
+#: ../templates/config/confmain.php:547
+#: ../templates/selfService/adminMain.php:519 ../help/help.inc:284
+msgid "Base URL"
+msgstr "Base URL"
+
+#: ../templates/config/confmodules.php:231 ../help/help.inc:146
 msgid "Base module"
 msgstr "Base module"
 
-#: ../templates/pdfedit/pdfpage.php:445
-msgid "Beginning"
-msgstr "Beginning"
-
 #: ../lib/types/pykotaBillingCodeType.inc:91
 #: ../lib/modules/pykotaBillingCode.inc:77
 #: ../lib/modules/pykotaBillingCode.inc:115
 #: ../lib/modules/pykotaBillingCode.inc:127
 #: ../lib/modules/pykotaBillingCode.inc:129
 #: ../lib/modules/pykotaBillingCode.inc:141
-#: ../lib/modules/pykotaBillingCode.inc:264
+#: ../lib/modules/pykotaBillingCode.inc:262
 msgid "Billing code"
 msgstr "Billing code"
 
@@ -1913,7 +1925,7 @@ msgstr "Billing codes"
 msgid "Binary value"
 msgstr "Binary value"
 
-#: ../templates/serverInfo.php:286 ../templates/serverInfo.php:375
+#: ../templates/serverInfo.php:287 ../templates/serverInfo.php:376
 msgid "Bind"
 msgstr "Bind"
 
@@ -1925,11 +1937,11 @@ msgstr "Bind DNS"
 msgid "Bind DNS entries"
 msgstr "Bind DNS entries"
 
-#: ../templates/config/jobs.php:233 ../templates/config/confmain.php:521
+#: ../templates/config/jobs.php:233 ../templates/config/confmain.php:524
 msgid "Bind password"
 msgstr "Bind password"
 
-#: ../templates/config/jobs.php:228 ../templates/config/confmain.php:519
+#: ../templates/config/jobs.php:228 ../templates/config/confmain.php:522
 msgid "Bind user"
 msgstr "Bind user"
 
@@ -1937,12 +1949,12 @@ msgstr "Bind user"
 msgid "Bind user and password"
 msgstr "Bind user and password"
 
-#: ../lib/modules/quota.inc:53 ../lib/modules/systemQuotas.inc:101
+#: ../lib/modules/quota.inc:56 ../lib/modules/systemQuotas.inc:104
 msgid "Block hard quota"
 msgstr "Block hard quota"
 
-#: ../lib/modules/quota.inc:53 ../lib/modules/quota.inc:54
-#: ../lib/modules/systemQuotas.inc:101 ../lib/modules/systemQuotas.inc:102
+#: ../lib/modules/quota.inc:56 ../lib/modules/quota.inc:57
+#: ../lib/modules/systemQuotas.inc:104 ../lib/modules/systemQuotas.inc:105
 msgid ""
 "Block hard quota contains invalid characters. Only natural numbers are "
 "allowed."
@@ -1950,16 +1962,16 @@ msgstr ""
 "Block hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 
-#: ../lib/modules/quota.inc:59 ../lib/modules/systemQuotas.inc:107
+#: ../lib/modules/quota.inc:62 ../lib/modules/systemQuotas.inc:110
 msgid "Block quota"
 msgstr "Block quota"
 
-#: ../lib/modules/quota.inc:51 ../lib/modules/systemQuotas.inc:99
+#: ../lib/modules/quota.inc:54 ../lib/modules/systemQuotas.inc:102
 msgid "Block soft quota"
 msgstr "Block soft quota"
 
-#: ../lib/modules/quota.inc:51 ../lib/modules/quota.inc:52
-#: ../lib/modules/systemQuotas.inc:99 ../lib/modules/systemQuotas.inc:100
+#: ../lib/modules/quota.inc:54 ../lib/modules/quota.inc:55
+#: ../lib/modules/systemQuotas.inc:102 ../lib/modules/systemQuotas.inc:103
 msgid ""
 "Block soft quota contains invalid characters. Only natural numbers are "
 "allowed."
@@ -1967,20 +1979,20 @@ msgstr ""
 "Block soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 
-#: ../lib/modules/quota.inc:59 ../lib/modules/quota.inc:60
-#: ../lib/modules/systemQuotas.inc:107 ../lib/modules/systemQuotas.inc:108
+#: ../lib/modules/quota.inc:62 ../lib/modules/quota.inc:63
+#: ../lib/modules/systemQuotas.inc:110 ../lib/modules/systemQuotas.inc:111
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "Block soft quota must be smaller than block hard quota."
 
-#: ../templates/lists/changePassword.php:339
-#: ../templates/config/confmain.php:399
+#: ../templates/lists/changePassword.php:340
+#: ../templates/config/confmain.php:402
 msgid "Both"
 msgstr "Both"
 
 #: ../lib/modules/qmailGroup.inc:72 ../lib/modules/qmailGroup.inc:143
 #: ../lib/modules/qmailGroup.inc:147 ../lib/modules/qmailGroup.inc:263
 #: ../lib/modules/qmailGroup.inc:375 ../lib/modules/qmailGroup.inc:431
-#: ../lib/modules/qmailGroup.inc:522 ../lib/modules/qmailGroup.inc:1009
+#: ../lib/modules/qmailGroup.inc:522 ../lib/modules/qmailGroup.inc:1007
 msgid "Bounce admin email"
 msgstr "Bounce admin email"
 
@@ -2007,19 +2019,19 @@ msgstr "Bulk update the following DNs"
 #: ../lib/modules/windowsUser.inc:314 ../lib/modules/windowsUser.inc:318
 #: ../lib/modules/windowsUser.inc:702 ../lib/modules/windowsUser.inc:771
 #: ../lib/modules/windowsUser.inc:880 ../lib/modules/windowsUser.inc:999
-#: ../lib/modules/windowsUser.inc:1141 ../lib/modules/windowsUser.inc:2458
-#: ../lib/modules/windowsUser.inc:3225 ../lib/modules/inetOrgPerson.inc:105
-#: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:238
-#: ../lib/modules/inetOrgPerson.inc:378 ../lib/modules/inetOrgPerson.inc:619
-#: ../lib/modules/inetOrgPerson.inc:791 ../lib/modules/inetOrgPerson.inc:795
-#: ../lib/modules/inetOrgPerson.inc:1562 ../lib/modules/inetOrgPerson.inc:1565
-#: ../lib/modules/inetOrgPerson.inc:2000 ../lib/modules/inetOrgPerson.inc:2712
-#: ../lib/modules/inetOrgPerson.inc:3680 ../lib/modules/inetOrgPerson.inc:3725
+#: ../lib/modules/windowsUser.inc:1141 ../lib/modules/windowsUser.inc:2456
+#: ../lib/modules/windowsUser.inc:3223 ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:236
+#: ../lib/modules/inetOrgPerson.inc:376 ../lib/modules/inetOrgPerson.inc:617
+#: ../lib/modules/inetOrgPerson.inc:789 ../lib/modules/inetOrgPerson.inc:793
+#: ../lib/modules/inetOrgPerson.inc:1560 ../lib/modules/inetOrgPerson.inc:1563
+#: ../lib/modules/inetOrgPerson.inc:1996 ../lib/modules/inetOrgPerson.inc:2708
+#: ../lib/modules/inetOrgPerson.inc:3660 ../lib/modules/inetOrgPerson.inc:3705
 msgid "Business category"
 msgstr "Business category"
 
 #: ../lib/modules/windowsUser.inc:315 ../lib/modules/windowsUser.inc:319
-#: ../lib/modules/inetOrgPerson.inc:792 ../lib/modules/inetOrgPerson.inc:796
+#: ../lib/modules/inetOrgPerson.inc:790 ../lib/modules/inetOrgPerson.inc:794
 msgid "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 msgstr "Business category (e.g. Administration, IT-Services, Manangement, ...)"
 
@@ -2059,25 +2071,25 @@ msgstr ""
 "If you want to hide the command and only show the output then activate this "
 "option."
 
-#: ../templates/serverInfo.php:253 ../templates/serverInfo.php:259
+#: ../templates/serverInfo.php:254 ../templates/serverInfo.php:260
 msgid "Bytes sent"
 msgstr "Bytes sent"
 
 #: ../lib/passwordExpirationJob.inc:83 ../lib/passwordExpirationJob.inc:131
-#: ../help/help.inc:338
+#: ../help/help.inc:350
 msgid "CC address"
 msgstr "CC address"
 
-#: ../lib/modules/bindDLZ.inc:268 ../lib/modules/bindDLZ.inc:274
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:497
+#: ../lib/modules/bindDLZ.inc:271 ../lib/modules/bindDLZ.inc:277
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:500
 msgid "CNAME record"
 msgstr "CNAME record"
 
-#: ../lib/modules/bindDLZ.inc:439
+#: ../lib/modules/bindDLZ.inc:442
 msgid "CNAME records"
 msgstr "CNAME records"
 
-#: ../templates/masscreate.php:253
+#: ../templates/upload/masscreate.php:279
 msgid "CSV file"
 msgstr "CSV file"
 
@@ -2089,8 +2101,8 @@ msgstr "Cache timeout"
 #: ../lib/modules/asteriskAccount.inc:272
 #: ../lib/modules/asteriskAccount.inc:355
 #: ../lib/modules/asteriskAccount.inc:615
-#: ../lib/modules/asteriskAccount.inc:991
-#: ../lib/modules/asteriskAccount.inc:1248
+#: ../lib/modules/asteriskAccount.inc:989
+#: ../lib/modules/asteriskAccount.inc:1246
 msgid "Call groups"
 msgstr "Call groups"
 
@@ -2098,7 +2110,7 @@ msgstr "Call groups"
 #: ../lib/modules/asteriskAccount.inc:266
 #: ../lib/modules/asteriskAccount.inc:304
 #: ../lib/modules/asteriskAccount.inc:589
-#: ../lib/modules/asteriskAccount.inc:985
+#: ../lib/modules/asteriskAccount.inc:983
 msgid "Caller ID"
 msgstr "Caller ID"
 
@@ -2119,77 +2131,79 @@ msgstr "Can be left empty."
 #: ../lib/modules/asteriskAccount.inc:294
 #: ../lib/modules/asteriskAccount.inc:515
 #: ../lib/modules/asteriskAccount.inc:741
-#: ../lib/modules/asteriskAccount.inc:1013
-#: ../lib/modules/asteriskAccount.inc:1292
+#: ../lib/modules/asteriskAccount.inc:1011
+#: ../lib/modules/asteriskAccount.inc:1290
 msgid "Can call forward"
 msgstr "Can call forward"
 
-#: ../templates/lists/changePassword.php:353
-#: ../templates/lists/changePassword.php:392
-#: ../templates/lists/changePassword.php:445
-#: ../templates/lists/changePassword.php:481 ../templates/ou_edit.php:125
+#: ../templates/lists/changePassword.php:354
+#: ../templates/lists/changePassword.php:393
+#: ../templates/lists/changePassword.php:446
+#: ../templates/lists/changePassword.php:482 ../templates/ou_edit.php:135
 #: ../templates/config/profmanage.php:260
 #: ../templates/config/profmanage.php:272
 #: ../templates/config/profmanage.php:281
 #: ../templates/config/profmanage.php:299
 #: ../templates/config/profmanage.php:310
 #: ../templates/config/mainmanage.php:487
-#: ../templates/config/confmodules.php:239 ../templates/config/jobList.php:254
+#: ../templates/config/confmodules.php:246 ../templates/config/jobList.php:254
 #: ../templates/config/jobs.php:359 ../templates/config/jobs.php:403
-#: ../templates/config/confmain.php:548
-#: ../templates/config/moduleSettings.php:253
-#: ../templates/config/conftypes.php:375
+#: ../templates/config/confmain.php:583
+#: ../templates/config/moduleSettings.php:261
+#: ../templates/config/conftypes.php:390
 #: ../templates/selfService/profManage.php:210
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:242
-#: ../templates/selfService/adminMain.php:738
-#: ../templates/pdfedit/pdfpage.php:642 ../templates/pdfedit/pdfmain.php:215
-#: ../templates/pdfedit/pdfmain.php:222 ../templates/pdfedit/pdfmain.php:228
-#: ../templates/delete.php:129 ../templates/profedit/profilepage.php:246
-#: ../templates/profedit/profilemain.php:204
-#: ../templates/profedit/profilemain.php:210
-#: ../templates/profedit/profilemain.php:216
+#: ../templates/selfService/selfService2Factor.php:207
+#: ../templates/selfService/adminMain.php:791
+#: ../templates/pdfedit/pdfpage.php:660 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:267 ../templates/pdfedit/pdfmain.php:273
+#: ../templates/delete.php:135 ../templates/profedit/profilepage.php:258
+#: ../templates/profedit/profilemain.php:245
+#: ../templates/profedit/profilemain.php:251
+#: ../templates/profedit/profilemain.php:257
 #: ../templates/3rdParty/pla/htdocs/update_confirm.php:197
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:83
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:136
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:121
 #: ../templates/3rdParty/pla/htdocs/mass_delete.php:119
-#: ../templates/initsuff.php:195 ../lib/types/automountType.inc:234
-#: ../lib/types/user.inc:329 ../lib/types/bind.inc:175
-#: ../lib/modules/locking389ds.inc:160 ../lib/modules/kolabGroup.inc:294
-#: ../lib/modules/pykotaPrinter.inc:431 ../lib/modules/mitKerberos.inc:693
-#: ../lib/modules/qmailUser.inc:928 ../lib/modules/zarafaContact.inc:434
-#: ../lib/modules/windowsHost.inc:226 ../lib/modules/zarafaGroup.inc:444
-#: ../lib/modules/device.inc:254 ../lib/modules/sambaSamAccount.inc:1381
+#: ../templates/initsuff.php:196 ../templates/login2Factor.php:220
+#: ../lib/types/automountType.inc:211 ../lib/types/user.inc:329
+#: ../lib/types/bind.inc:152 ../lib/modules/locking389ds.inc:160
+#: ../lib/modules/kolabGroup.inc:294 ../lib/modules/pykotaPrinter.inc:431
+#: ../lib/modules/mitKerberos.inc:693 ../lib/modules/qmailUser.inc:928
+#: ../lib/modules/zarafaContact.inc:434 ../lib/modules/windowsHost.inc:226
+#: ../lib/modules/zarafaGroup.inc:444 ../lib/modules/device.inc:257
+#: ../lib/modules/sambaSamAccount.inc:1381
 #: ../lib/modules/sambaSamAccount.inc:1427
-#: ../lib/modules/sambaSamAccount.inc:1513 ../lib/modules/zarafaUser.inc:918
+#: ../lib/modules/sambaSamAccount.inc:1513 ../lib/modules/zarafaUser.inc:921
 #: ../lib/modules/windowsUser.inc:1601 ../lib/modules/windowsUser.inc:1864
-#: ../lib/modules/kolabUser.inc:520 ../lib/modules/sambaGroupMapping.inc:490
+#: ../lib/modules/kolabUser.inc:523 ../lib/modules/sambaGroupMapping.inc:490
 #: ../lib/modules/shadowAccount.inc:490 ../lib/modules/shadowAccount.inc:543
-#: ../lib/modules/nisnetgroup.inc:490 ../lib/modules/inetOrgPerson.inc:1801
+#: ../lib/modules/nisnetgroup.inc:493 ../lib/modules/inetOrgPerson.inc:1799
 #: ../lib/modules/freeRadius.inc:566 ../lib/modules/kolabSharedFolder.inc:434
-#: ../lib/modules/customFields.inc:1089 ../lib/modules/aliasEntry.inc:147
+#: ../lib/modules/customFields.inc:1087 ../lib/modules/aliasEntry.inc:147
 #: ../lib/modules/aliasEntry.inc:167 ../lib/modules/qmailGroup.inc:823
-#: ../lib/modules/organizationalRole.inc:324 ../lib/modules/fixed_ip.inc:587
-#: ../lib/modules/heimdalKerberos.inc:603 ../lib/modules/windowsGroup.inc:626
-#: ../lib/modules/windowsGroup.inc:687 ../lib/modules/groupOfNames.inc:383
-#: ../lib/modules/groupOfNames.inc:538 ../lib/modules/nisMailAlias.inc:385
-#: ../lib/lists.inc:729 ../lib/lists.inc:811 ../lib/modules.inc:1254
+#: ../lib/modules/organizationalRole.inc:327 ../lib/modules/fixed_ip.inc:590
+#: ../lib/modules/heimdalKerberos.inc:603 ../lib/modules/windowsGroup.inc:629
+#: ../lib/modules/windowsGroup.inc:690 ../lib/modules/groupOfNames.inc:386
+#: ../lib/modules/groupOfNames.inc:541 ../lib/modules/nisMailAlias.inc:385
+#: ../lib/lists.inc:731 ../lib/lists.inc:812 ../lib/modules.inc:1262
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../templates/login.php:588 ../templates/login.php:647
-#: ../templates/login.php:652 ../templates/config/jobs.php:517
-#: ../templates/selfService/selfServiceLogin.php:149
-#: ../templates/selfService/selfServiceLogin.php:201
-#: ../templates/selfService/selfServiceLogin.php:207
-#: ../templates/selfService/selfServiceMain.php:179
-#: ../templates/selfService/selfServiceMain.php:200
+#: ../templates/login.php:597 ../templates/login.php:668
+#: ../templates/login.php:673 ../templates/config/jobs.php:517
+#: ../templates/selfService/selfServiceLogin.php:158
+#: ../templates/selfService/selfServiceLogin.php:217
+#: ../templates/selfService/selfServiceLogin.php:223
+#: ../templates/selfService/selfServiceMain.php:188
+#: ../templates/selfService/selfServiceMain.php:209
 #: ../lib/modules/selfRegistration.inc:805
 msgid "Cannot connect to specified LDAP server. Please try again."
 msgstr "Cannot connect to specified LDAP server. Please try again."
 
-#: ../templates/login.php:321 ../lib/config.inc:2228
+#: ../templates/login.php:321 ../lib/config.inc:2371
 msgid "Cannot open config file!"
 msgstr "Cannot open config file!"
 
@@ -2197,7 +2211,7 @@ msgstr "Cannot open config file!"
 msgid "Cannot update quota."
 msgstr "Cannot update quota."
 
-#: ../lib/config.inc:2240 ../lib/config.inc:2248
+#: ../lib/config.inc:2383 ../lib/config.inc:2391
 msgid ""
 "Cannot write certificate file. Please check the permissions of config/"
 "serverCerts.pem."
@@ -2205,10 +2219,10 @@ msgstr ""
 "Cannot write certificate file. Please check the permissions of config/"
 "serverCerts.pem."
 
-#: ../lib/modules/zarafaUser.inc:134 ../lib/modules/zarafaUser.inc:265
-#: ../lib/modules/zarafaUser.inc:383 ../lib/modules/zarafaUser.inc:437
-#: ../lib/modules/zarafaUser.inc:574 ../lib/modules/zarafaUser.inc:1270
-#: ../lib/modules/zarafaUser.inc:1838
+#: ../lib/modules/zarafaUser.inc:137 ../lib/modules/zarafaUser.inc:268
+#: ../lib/modules/zarafaUser.inc:386 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:577 ../lib/modules/zarafaUser.inc:1271
+#: ../lib/modules/zarafaUser.inc:1839
 msgid "Capacity"
 msgstr "Capacity"
 
@@ -2218,52 +2232,57 @@ msgstr "Capacity"
 msgid "Captcha"
 msgstr "Captcha"
 
-#: ../templates/selfService/adminMain.php:518
+#: ../templates/config/confmain.php:555
+#: ../templates/selfService/adminMain.php:527 ../help/help.inc:290
+msgid "Caption"
+msgstr "Caption"
+
+#: ../templates/selfService/adminMain.php:571
 msgid "Captions and labels"
 msgstr "Captions and labels"
 
 #: ../lib/modules/windowsUser.inc:302 ../lib/modules/windowsUser.inc:678
 #: ../lib/modules/windowsUser.inc:871 ../lib/modules/windowsUser.inc:1132
-#: ../lib/modules/windowsUser.inc:2455 ../lib/modules/windowsUser.inc:3222
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:540
-#: ../lib/modules/inetOrgPerson.inc:613 ../lib/modules/inetOrgPerson.inc:815
-#: ../lib/modules/inetOrgPerson.inc:1535 ../lib/modules/inetOrgPerson.inc:1538
-#: ../lib/modules/inetOrgPerson.inc:2002 ../lib/modules/inetOrgPerson.inc:2690
-#: ../lib/modules/inetOrgPerson.inc:3676 ../lib/modules/inetOrgPerson.inc:3724
+#: ../lib/modules/windowsUser.inc:2453 ../lib/modules/windowsUser.inc:3220
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:538
+#: ../lib/modules/inetOrgPerson.inc:611 ../lib/modules/inetOrgPerson.inc:813
+#: ../lib/modules/inetOrgPerson.inc:1533 ../lib/modules/inetOrgPerson.inc:1536
+#: ../lib/modules/inetOrgPerson.inc:1998 ../lib/modules/inetOrgPerson.inc:2686
+#: ../lib/modules/inetOrgPerson.inc:3656 ../lib/modules/inetOrgPerson.inc:3704
 msgid "Car license"
 msgstr "Car license"
 
-#: ../templates/selfService/adminMain.php:536
+#: ../templates/selfService/adminMain.php:589
 #: ../lib/modules/locking389ds.inc:83 ../lib/modules/locking389ds.inc:156
 #: ../lib/modules/mitKerberos.inc:377 ../lib/modules/mitKerberos.inc:388
 #: ../lib/modules/mitKerberos.inc:689 ../lib/modules/qmailUser.inc:671
 #: ../lib/modules/qmailUser.inc:924 ../lib/modules/zarafaContact.inc:256
 #: ../lib/modules/windowsHost.inc:155 ../lib/modules/windowsHost.inc:225
-#: ../lib/modules/zarafaGroup.inc:251 ../lib/modules/device.inc:181
+#: ../lib/modules/zarafaGroup.inc:251 ../lib/modules/device.inc:184
 #: ../lib/modules/sambaSamAccount.inc:1144
-#: ../lib/modules/sambaSamAccount.inc:1423 ../lib/modules/zarafaUser.inc:490
-#: ../lib/modules/zarafaUser.inc:586 ../lib/modules/windowsUser.inc:1161
+#: ../lib/modules/sambaSamAccount.inc:1423 ../lib/modules/zarafaUser.inc:493
+#: ../lib/modules/zarafaUser.inc:589 ../lib/modules/windowsUser.inc:1161
 #: ../lib/modules/windowsUser.inc:1200 ../lib/modules/windowsUser.inc:1597
 #: ../lib/modules/windowsUser.inc:1860 ../lib/modules/shadowAccount.inc:355
 #: ../lib/modules/shadowAccount.inc:368 ../lib/modules/shadowAccount.inc:486
-#: ../lib/modules/shadowAccount.inc:539 ../lib/modules/inetOrgPerson.inc:1622
+#: ../lib/modules/shadowAccount.inc:539 ../lib/modules/inetOrgPerson.inc:1620
 #: ../lib/modules/freeRadius.inc:383 ../lib/modules/freeRadius.inc:562
-#: ../lib/modules/asteriskExtension.inc:236 ../lib/modules/aliasEntry.inc:100
-#: ../lib/modules/qmailGroup.inc:572 ../lib/modules/organizationalRole.inc:195
+#: ../lib/modules/asteriskExtension.inc:238 ../lib/modules/aliasEntry.inc:100
+#: ../lib/modules/qmailGroup.inc:572 ../lib/modules/organizationalRole.inc:198
 #: ../lib/modules/passwordSelfReset.inc:361
 #: ../lib/modules/heimdalKerberos.inc:324
 #: ../lib/modules/heimdalKerberos.inc:335
-#: ../lib/modules/heimdalKerberos.inc:599 ../lib/modules/windowsGroup.inc:368
-#: ../lib/modules/windowsGroup.inc:625 ../lib/modules/groupOfNames.inc:243
-#: ../lib/modules/groupOfNames.inc:251
+#: ../lib/modules/heimdalKerberos.inc:599 ../lib/modules/windowsGroup.inc:371
+#: ../lib/modules/windowsGroup.inc:628 ../lib/modules/groupOfNames.inc:246
+#: ../lib/modules/groupOfNames.inc:254
 msgid "Change"
 msgstr "Change"
 
-#: ../templates/lists/changePassword.php:227
+#: ../templates/lists/changePassword.php:228
 msgid "Change Asterisk password"
 msgstr "Change Asterisk password"
 
-#: ../templates/lists/changePassword.php:230
+#: ../templates/lists/changePassword.php:231
 msgid "Change Asterisk voicemail password"
 msgstr "Change Asterisk voicemail password"
 
@@ -2271,24 +2290,24 @@ msgstr "Change Asterisk voicemail password"
 msgid "Change GID number of users and hosts"
 msgstr "Change GID number of users and hosts"
 
-#: ../templates/lists/changePassword.php:233
-#: ../templates/lists/changePassword.php:236
+#: ../templates/lists/changePassword.php:234
+#: ../templates/lists/changePassword.php:237
 msgid "Change Kerberos password"
 msgstr "Change Kerberos password"
 
-#: ../templates/lists/changePassword.php:220
+#: ../templates/lists/changePassword.php:221
 msgid "Change Samba LM password"
 msgstr "Change Samba LM password"
 
-#: ../templates/lists/changePassword.php:218
+#: ../templates/lists/changePassword.php:219
 msgid "Change Samba NT password"
 msgstr "Change Samba NT password"
 
-#: ../templates/lists/changePassword.php:212
+#: ../templates/lists/changePassword.php:213
 msgid "Change Unix password"
 msgstr "Change Unix password"
 
-#: ../templates/lists/changePassword.php:239
+#: ../templates/lists/changePassword.php:240
 msgid "Change Windows password"
 msgstr "Change Windows password"
 
@@ -2301,11 +2320,11 @@ msgstr "Change account status"
 msgid "Change default profile"
 msgstr "Change default profile"
 
-#: ../templates/selfService/adminMain.php:597
+#: ../templates/selfService/adminMain.php:650
 msgid "Change field label."
 msgstr "Change field label."
 
-#: ../lib/lists.inc:811
+#: ../lib/lists.inc:812
 msgid "Change list settings"
 msgstr "Change list settings"
 
@@ -2313,26 +2332,26 @@ msgstr "Change list settings"
 msgid "Change master password"
 msgstr "Change master password"
 
-#: ../templates/lists/changePassword.php:215
-#: ../templates/lists/changePassword.php:260
-#: ../templates/lists/changePassword.php:350
-#: ../templates/lists/changePassword.php:352
-#: ../templates/lists/changePassword.php:389
-#: ../templates/lists/changePassword.php:391 ../lib/types/user.inc:742
+#: ../templates/lists/changePassword.php:216
+#: ../templates/lists/changePassword.php:261
+#: ../templates/lists/changePassword.php:351
+#: ../templates/lists/changePassword.php:353
+#: ../templates/lists/changePassword.php:390
+#: ../templates/lists/changePassword.php:392 ../lib/types/user.inc:742
 #: ../help/help.inc:105
 msgid "Change password"
 msgstr "Change password"
 
-#: ../templates/lists/changePassword.php:267
 #: ../templates/lists/changePassword.php:268
+#: ../templates/lists/changePassword.php:269
 msgid "Change password now?"
 msgstr "Change password now?"
 
-#: ../templates/config/confmain.php:273
+#: ../templates/config/confmain.php:276
 msgid "Change passwords"
 msgstr "Change passwords"
 
-#: ../lib/lists.inc:812
+#: ../lib/lists.inc:813
 msgid "Change settings"
 msgstr "Change settings"
 
@@ -2350,11 +2369,11 @@ msgstr "Charlie"
 msgid "Check home directories"
 msgstr "Check home directories"
 
-#: ../templates/tests/index.php:54 ../lib/tools/tests.inc:112
+#: ../templates/tests/index.php:55 ../lib/tools/tests.inc:113
 msgid "Check if quotas and homedirectories can be managed."
 msgstr "Check if quotas and homedirectories can be managed."
 
-#: ../templates/tests/index.php:60 ../lib/tools/tests.inc:118
+#: ../templates/tests/index.php:61 ../lib/tools/tests.inc:119
 msgid ""
 "Check if the LDAP schema fits the requirements of the selected account "
 "modules."
@@ -2366,11 +2385,11 @@ msgstr ""
 msgid "Check password"
 msgstr "Check password"
 
-#: ../templates/tests/lamdaemonTest.php:87
+#: ../templates/tests/lamdaemonTest.php:88
 msgid "Check quotas"
 msgstr "Check quotas"
 
-#: ../templates/masscreate.php:247
+#: ../templates/upload/masscreate.php:273
 msgid ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
@@ -2378,7 +2397,7 @@ msgstr ""
 "Check your input carefully. LAM will only do some basic checks on the upload "
 "data."
 
-#: ../lib/modules/customFields.inc:2895
+#: ../lib/modules/customFields.inc:2893
 msgid "Checkbox"
 msgstr "Checkbox"
 
@@ -2401,23 +2420,23 @@ msgstr ""
 "password as for the LAM login or LAM will ask you for a password when it is "
 "required."
 
-#: ../lib/modules/puppetClient.inc:97 ../lib/modules/puppetClient.inc:101
-#: ../lib/modules/puppetClient.inc:149 ../lib/modules/puppetClient.inc:165
-#: ../lib/modules/puppetClient.inc:178 ../lib/modules/puppetClient.inc:280
-#: ../lib/modules/puppetClient.inc:283 ../lib/modules/puppetClient.inc:411
+#: ../lib/modules/puppetClient.inc:100 ../lib/modules/puppetClient.inc:104
+#: ../lib/modules/puppetClient.inc:152 ../lib/modules/puppetClient.inc:168
+#: ../lib/modules/puppetClient.inc:181 ../lib/modules/puppetClient.inc:283
+#: ../lib/modules/puppetClient.inc:286 ../lib/modules/puppetClient.inc:412
 msgid "Classes"
 msgstr "Classes"
 
-#: ../lib/modules/qmailUser.inc:1230 ../lib/modules/windowsUser.inc:3544
-#: ../lib/modules/shadowAccount.inc:903 ../lib/modules/freeRadius.inc:824
+#: ../lib/modules/qmailUser.inc:1228 ../lib/modules/windowsUser.inc:3542
+#: ../lib/modules/shadowAccount.inc:901 ../lib/modules/freeRadius.inc:822
 msgid "Cleanup expired user accounts"
 msgstr "Cleanup expired user accounts"
 
-#: ../lib/lists.inc:389
+#: ../lib/lists.inc:391
 msgid "Clear filter"
 msgstr "Clear filter"
 
-#: ../lib/config.inc:322
+#: ../lib/config.inc:325
 msgid "Click here if you are not directed to the next page."
 msgstr "Click here if you are not directed to the next page."
 
@@ -2436,11 +2455,11 @@ msgstr "Click to switch between thumbnail and original size."
 #: ../lib/modules/sambaSamAccount.inc:242
 #: ../lib/modules/sambaSamAccount.inc:379
 #: ../lib/modules/sambaSamAccount.inc:1481
-#: ../lib/modules/sambaSamAccount.inc:1958
+#: ../lib/modules/sambaSamAccount.inc:1956
 msgid "Client printer is default"
 msgstr "Client printer is default"
 
-#: ../templates/schema/schema.php:199
+#: ../templates/schema/schema.php:200
 msgid "Collective"
 msgstr "Collective"
 
@@ -2448,8 +2467,8 @@ msgstr "Collective"
 msgid "Color laser printer"
 msgstr "Color laser printer"
 
-#: ../templates/masscreate.php:284 ../lib/modules/customFields.inc:132
-#: ../lib/modules/customFields.inc:2739
+#: ../templates/upload/masscreate.php:310 ../lib/modules/customFields.inc:132
+#: ../lib/modules/customFields.inc:2737
 msgid "Columns"
 msgstr "Columns"
 
@@ -2472,16 +2491,16 @@ msgstr "Command"
 #: ../lib/modules/sudoRole.inc:82 ../lib/modules/sudoRole.inc:108
 #: ../lib/modules/sudoRole.inc:171 ../lib/modules/sudoRole.inc:218
 #: ../lib/modules/sudoRole.inc:230 ../lib/modules/sudoRole.inc:370
-#: ../lib/modules/sudoRole.inc:757
+#: ../lib/modules/sudoRole.inc:755
 msgid "Commands"
 msgstr "Commands"
 
-#: ../lib/modules/pykotaUser.inc:375 ../lib/modules/pykotaUser.inc:599
-#: ../lib/modules/pykotaUser.inc:911 ../lib/modules/pykotaUser.inc:971
+#: ../lib/modules/pykotaUser.inc:378 ../lib/modules/pykotaUser.inc:602
+#: ../lib/modules/pykotaUser.inc:912 ../lib/modules/pykotaUser.inc:972
 msgid "Comment"
 msgstr "Comment"
 
-#: ../lib/modules/pykotaUser.inc:137
+#: ../lib/modules/pykotaUser.inc:140
 msgid "Comment for initial balance."
 msgstr "Comment for initial balance."
 
@@ -2496,34 +2515,34 @@ msgstr "Common examples are \"@givenname@%sn%\" or \"%givenname%.%sn%\"."
 #: ../templates/config/mainmanage.php:379 ../lib/types/host.inc:92
 #: ../lib/types/user.inc:91 ../lib/modules/pykotaGroup.inc:113
 #: ../lib/modules/pykotaGroup.inc:157 ../lib/modules/pykotaGroup.inc:185
-#: ../lib/modules/pykotaGroup.inc:469 ../lib/modules/posixAccount.inc:129
+#: ../lib/modules/pykotaGroup.inc:467 ../lib/modules/posixAccount.inc:129
 #: ../lib/modules/posixAccount.inc:188 ../lib/modules/posixAccount.inc:289
 #: ../lib/modules/posixAccount.inc:362 ../lib/modules/posixAccount.inc:493
 #: ../lib/modules/posixAccount.inc:519 ../lib/modules/posixAccount.inc:1414
-#: ../lib/modules/posixAccount.inc:1848 ../lib/modules/posixAccount.inc:2766
+#: ../lib/modules/posixAccount.inc:1846 ../lib/modules/posixAccount.inc:2764
 #: ../lib/modules/windowsUser.inc:118 ../lib/modules/windowsUser.inc:424
 #: ../lib/modules/windowsUser.inc:741 ../lib/modules/windowsUser.inc:816
 #: ../lib/modules/windowsUser.inc:952 ../lib/modules/windowsUser.inc:1087
-#: ../lib/modules/windowsUser.inc:2426 ../lib/modules/pykotaUser.inc:108
-#: ../lib/modules/pykotaUser.inc:199 ../lib/modules/pykotaUser.inc:271
-#: ../lib/modules/pykotaUser.inc:405 ../lib/modules/pykotaUser.inc:891
-#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:175
-#: ../lib/modules/inetOrgPerson.inc:645 ../lib/modules/inetOrgPerson.inc:767
-#: ../lib/modules/inetOrgPerson.inc:1278 ../lib/modules/inetOrgPerson.inc:1281
-#: ../lib/modules/inetOrgPerson.inc:1997 ../lib/modules/inetOrgPerson.inc:2134
-#: ../lib/modules/inetOrgPerson.inc:3734
-#: ../lib/modules/asteriskExtension.inc:118
+#: ../lib/modules/windowsUser.inc:2424 ../lib/modules/pykotaUser.inc:111
+#: ../lib/modules/pykotaUser.inc:202 ../lib/modules/pykotaUser.inc:274
+#: ../lib/modules/pykotaUser.inc:408 ../lib/modules/pykotaUser.inc:892
+#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:173
+#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:765
+#: ../lib/modules/inetOrgPerson.inc:1276 ../lib/modules/inetOrgPerson.inc:1279
+#: ../lib/modules/inetOrgPerson.inc:1993 ../lib/modules/inetOrgPerson.inc:2130
+#: ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/asteriskExtension.inc:120
 msgid "Common name"
 msgstr "Common name"
 
-#: ../lib/modules/asteriskExtension.inc:119
+#: ../lib/modules/asteriskExtension.inc:121
 msgid "Common name of the Asterisk extension."
 msgstr "Common name of the Asterisk extension."
 
 #: ../lib/types/user.inc:92 ../lib/modules/windowsUser.inc:350
 #: ../lib/modules/windowsUser.inc:637 ../lib/modules/windowsUser.inc:753
 #: ../lib/modules/windowsUser.inc:895 ../lib/modules/windowsUser.inc:1144
-#: ../lib/modules/windowsUser.inc:2444 ../lib/modules/windowsUser.inc:3226
+#: ../lib/modules/windowsUser.inc:2442 ../lib/modules/windowsUser.inc:3224
 msgid "Company"
 msgstr "Company"
 
@@ -2531,7 +2550,7 @@ msgstr "Company"
 msgid "Company Licence"
 msgstr "Company License"
 
-#: ../templates/serverInfo.php:335 ../templates/serverInfo.php:396
+#: ../templates/serverInfo.php:336 ../templates/serverInfo.php:397
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1168
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1172
 #: ../templates/3rdParty/pla/htdocs/compare_form.php:33
@@ -2560,11 +2579,11 @@ msgstr "Compare with another entry"
 msgid "Comparing the following DNs"
 msgstr "Comparing the following DNs"
 
-#: ../templates/serverInfo.php:284 ../templates/serverInfo.php:371
+#: ../templates/serverInfo.php:285 ../templates/serverInfo.php:372
 msgid "Completed"
 msgstr "Completed"
 
-#: ../templates/serverInfo.php:114
+#: ../templates/serverInfo.php:115
 msgid "Config suffix"
 msgstr "Config suffix"
 
@@ -2575,13 +2594,13 @@ msgstr "Configuration overview"
 #: ../lib/modules/qmailUser.inc:126 ../lib/modules/qmailUser.inc:179
 #: ../lib/modules/qmailUser.inc:259 ../lib/modules/qmailUser.inc:392
 #: ../lib/modules/qmailUser.inc:439 ../lib/modules/qmailUser.inc:629
-#: ../lib/modules/qmailUser.inc:1150
+#: ../lib/modules/qmailUser.inc:1148
 msgid "Configuration type"
 msgstr "Configuration type"
 
 #: ../lib/modules/qmailGroup.inc:96 ../lib/modules/qmailGroup.inc:228
 #: ../lib/modules/qmailGroup.inc:361 ../lib/modules/qmailGroup.inc:411
-#: ../lib/modules/qmailGroup.inc:623 ../lib/modules/qmailGroup.inc:1031
+#: ../lib/modules/qmailGroup.inc:623 ../lib/modules/qmailGroup.inc:1029
 msgid "Confirm sender"
 msgstr "Confirm sender"
 
@@ -2592,7 +2611,7 @@ msgstr "Confirmation mail settings"
 #: ../lib/modules/qmailGroup.inc:74 ../lib/modules/qmailGroup.inc:103
 #: ../lib/modules/qmailGroup.inc:152 ../lib/modules/qmailGroup.inc:271
 #: ../lib/modules/qmailGroup.inc:378 ../lib/modules/qmailGroup.inc:591
-#: ../lib/modules/qmailGroup.inc:1010
+#: ../lib/modules/qmailGroup.inc:1008
 msgid "Confirmation text"
 msgstr "Confirmation text"
 
@@ -2604,45 +2623,45 @@ msgstr ""
 "Confirmation text that is used if sender-confirmation is used. The usual "
 "%HEADER% magic of qmail-reply etc. can be used here."
 
-#: ../templates/config/confmodules.php:423
+#: ../templates/config/confmodules.php:431
 msgid "Conflicting module:"
 msgstr "Conflicting module:"
 
 #: ../lib/modules/sambaSamAccount.inc:240
 #: ../lib/modules/sambaSamAccount.inc:373
 #: ../lib/modules/sambaSamAccount.inc:1477
-#: ../lib/modules/sambaSamAccount.inc:1948
+#: ../lib/modules/sambaSamAccount.inc:1946
 msgid "Connect client drives"
 msgstr "Connect client drives"
 
 #: ../lib/modules/sambaSamAccount.inc:241
 #: ../lib/modules/sambaSamAccount.inc:376
 #: ../lib/modules/sambaSamAccount.inc:1479
-#: ../lib/modules/sambaSamAccount.inc:1953
+#: ../lib/modules/sambaSamAccount.inc:1951
 msgid "Connect client printers"
 msgstr "Connect client printers"
 
-#: ../templates/serverInfo.php:230
+#: ../templates/serverInfo.php:231
 msgid "Connection statistics"
 msgstr "Connection statistics"
 
 #: ../lib/types/oracleContextType.inc:78 ../lib/modules/oracleService.inc:65
 #: ../lib/modules/oracleService.inc:85 ../lib/modules/oracleService.inc:99
-#: ../lib/modules/oracleService.inc:123 ../lib/modules/oracleService.inc:174
+#: ../lib/modules/oracleService.inc:123 ../lib/modules/oracleService.inc:172
 msgid "Connection string"
 msgstr "Connection string"
 
 #: ../lib/modules/sambaSamAccount.inc:237
 #: ../lib/modules/sambaSamAccount.inc:1465
-#: ../lib/modules/sambaSamAccount.inc:1941
+#: ../lib/modules/sambaSamAccount.inc:1939
 msgid "Connection time limit"
 msgstr "Connection time limit"
 
-#: ../lib/modules/bindDLZ.inc:232
+#: ../lib/modules/bindDLZ.inc:235
 msgid "Contact address for this zone (e.g. \"root.example.com.\")."
 msgstr "Contact address for this zone (e.g. \"root.example.com.\")."
 
-#: ../lib/modules/windowsUser.inc:1100 ../lib/modules/inetOrgPerson.inc:1458
+#: ../lib/modules/windowsUser.inc:1100 ../lib/modules/inetOrgPerson.inc:1456
 msgid "Contact data"
 msgstr "Contact data"
 
@@ -2736,26 +2755,26 @@ msgstr "Could not rename file!"
 msgid "Could not rename the entry."
 msgstr "Could not rename the entry."
 
-#: ../templates/pdfedit/pdfpage.php:121
+#: ../templates/pdfedit/pdfpage.php:139
 msgid "Could not save PDF structure, access denied."
 msgstr "Could not save PDF structure, access denied."
 
-#: ../templates/pdfedit/pdfmain.php:187
-#: ../templates/profedit/profilemain.php:173
+#: ../templates/pdfedit/pdfmain.php:234
+#: ../templates/profedit/profilemain.php:216
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1185
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1189
-#: ../templates/initsuff.php:194 ../lib/modules/nisMailAliasUser.inc:366
+#: ../templates/initsuff.php:195 ../lib/modules/nisMailAliasUser.inc:375
 #: ../lib/modules/sambaSamAccount.inc:1566
 #: ../lib/modules/posixAccount.inc:1687
 msgid "Create"
 msgstr "Create"
 
-#: ../lib/lists.inc:515 ../lib/lists.inc:704 ../lib/modules.inc:1379
+#: ../lib/lists.inc:517 ../lib/lists.inc:706 ../lib/modules.inc:1387
 #: ../help/help.inc:238
 msgid "Create PDF file"
 msgstr "Create PDF file"
 
-#: ../templates/massDoUpload.php:202 ../templates/masscreate.php:264
+#: ../templates/upload/masscreate.php:290 ../lib/upload.inc:197
 msgid "Create PDF files"
 msgstr "Create PDF files"
 
@@ -2765,11 +2784,11 @@ msgstr "Create PDF files"
 msgid "Create a child entry"
 msgstr "Create a child entry"
 
-#: ../templates/pdfedit/pdfmain.php:180
+#: ../templates/pdfedit/pdfmain.php:227
 msgid "Create a new PDF structure"
 msgstr "Create a new PDF structure"
 
-#: ../templates/profedit/profilemain.php:161
+#: ../templates/profedit/profilemain.php:204
 msgid "Create a new profile"
 msgstr "Create a new profile"
 
@@ -2858,7 +2877,7 @@ msgstr "Create another user"
 msgid "Create another view"
 msgstr "Create another view"
 
-#: ../lib/lists.inc:709
+#: ../lib/lists.inc:711
 msgid "Create for"
 msgstr "Create for"
 
@@ -2898,7 +2917,7 @@ msgstr "Create object"
 msgid "Created by"
 msgstr "Created by"
 
-#: ../lib/types/automountType.inc:274
+#: ../lib/types/automountType.inc:251
 msgid "Created new automount map."
 msgstr "Created new automount map."
 
@@ -2907,7 +2926,7 @@ msgstr "Created new automount map."
 msgid "Created new profile."
 msgstr "Created new profile."
 
-#: ../lib/types/bind.inc:241
+#: ../lib/types/bind.inc:218
 msgid "Created new zone."
 msgstr "Created new zone."
 
@@ -2919,7 +2938,7 @@ msgstr ""
 "Creates a new group for the given account type. Groups build a container for "
 "object classes and attributes."
 
-#: ../lib/tools/fileUpload.inc:53
+#: ../lib/tools/fileUpload.inc:54
 msgid "Creates accounts by uploading a CSV formated file."
 msgstr "Creates accounts by uploading a CSV formated file."
 
@@ -2936,11 +2955,11 @@ msgstr "Creation time"
 msgid "Cron configuration"
 msgstr "Cron configuration"
 
-#: ../lib/modules/pykotaUser.inc:133
+#: ../lib/modules/pykotaUser.inc:136
 msgid "Current account balance for the user."
 msgstr "Current account balance for the user."
 
-#: ../templates/serverInfo.php:232 ../templates/serverInfo.php:237
+#: ../templates/serverInfo.php:233 ../templates/serverInfo.php:238
 msgid "Current connections"
 msgstr "Current connections"
 
@@ -2953,7 +2972,7 @@ msgstr "Current list of <b>%s</b> values for attribute <b>%s</b>:"
 msgid "Current usage (kB)"
 msgstr "Current usage (kB)"
 
-#: ../lib/modules/customFields.inc:1102 ../lib/modules/customFields.inc:1444
+#: ../lib/modules/customFields.inc:1100 ../lib/modules/customFields.inc:1442
 msgid "Custom fields"
 msgstr "Custom fields"
 
@@ -2961,7 +2980,7 @@ msgstr "Custom fields"
 msgid "Custom icon"
 msgstr "Custom icon"
 
-#: ../templates/config/conftypes.php:328 ../lib/modules/customFields.inc:172
+#: ../templates/config/conftypes.php:304 ../lib/modules/customFields.inc:172
 #: ../help/help.inc:182
 msgid "Custom label"
 msgstr "Custom label"
@@ -3008,7 +3027,7 @@ msgstr "DHCP count: %s"
 msgid "DHCP settings"
 msgstr "DHCP settings"
 
-#: ../templates/delete.php:105
+#: ../templates/delete.php:111
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:734
 #: ../templates/3rdParty/pla/lib/PageRender.php:110
 #: ../templates/3rdParty/pla/htdocs/compare.php:52
@@ -3016,8 +3035,8 @@ msgstr "DHCP settings"
 #: ../templates/3rdParty/pla/htdocs/create.php:92
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:35
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:112
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:57 ../lib/modules.inc:416
-#: ../lib/modules.inc:2013
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:57 ../lib/modules.inc:426
+#: ../lib/modules.inc:2021
 msgid "DN"
 msgstr "DN"
 
@@ -3027,11 +3046,11 @@ msgstr "DN"
 msgid "DN does not exist"
 msgstr "DN does not exist"
 
-#: ../templates/masscreate.php:288
+#: ../templates/upload/masscreate.php:314
 msgid "DN settings"
 msgstr "DN settings"
 
-#: ../templates/masscreate.php:317 ../help/help.inc:228
+#: ../templates/upload/masscreate.php:343 ../help/help.inc:228
 msgid "DN suffix"
 msgstr "DN suffix"
 
@@ -3041,7 +3060,7 @@ msgstr "DN where Radius profile templates are stored."
 
 #: ../lib/modules/dhcp_settings.inc:216 ../lib/modules/dhcp_settings.inc:231
 #: ../lib/modules/dhcp_settings.inc:273 ../lib/modules/dhcp_settings.inc:579
-#: ../lib/modules/dhcp_settings.inc:680
+#: ../lib/modules/dhcp_settings.inc:678
 msgid "DNS"
 msgstr "DNS"
 
@@ -3049,16 +3068,16 @@ msgstr "DNS"
 msgid "DNS (Domain Name System)"
 msgstr "DNS (Domain Name System)"
 
-#: ../lib/modules/bindDLZ.inc:74
+#: ../lib/modules/bindDLZ.inc:77
 msgid "DNS entry"
 msgstr "DNS entry"
 
-#: ../lib/types/bind.inc:159
+#: ../lib/types/bind.inc:136
 #, php-format
 msgid "DNS entry count: %s"
 msgstr "DNS entry count: %s"
 
-#: ../lib/modules/asteriskExtension.inc:115
+#: ../lib/modules/asteriskExtension.inc:117
 msgid "DNs of the extension owners"
 msgstr "DNs of the extension owners"
 
@@ -3069,12 +3088,12 @@ msgstr "DSML V.1 Export"
 #: ../lib/modules/asteriskAccount.inc:273
 #: ../lib/modules/asteriskAccount.inc:362
 #: ../lib/modules/asteriskAccount.inc:627
-#: ../lib/modules/asteriskAccount.inc:1250
+#: ../lib/modules/asteriskAccount.inc:1248
 msgid "DTFM flags"
 msgstr "DTFM flags"
 
 #: ../lib/modules/asteriskAccount.inc:139
-#: ../lib/modules/asteriskAccount.inc:992
+#: ../lib/modules/asteriskAccount.inc:990
 msgid "DTMF mode"
 msgstr "DTMF mode"
 
@@ -3094,7 +3113,7 @@ msgstr "Database"
 msgid "Database connection ok."
 msgstr "Database connection ok."
 
-#: ../lib/types/oracleContextType.inc:186
+#: ../lib/types/oracleContextType.inc:167
 #, php-format
 msgid "Database count: %s"
 msgstr "Database count: %s"
@@ -3127,9 +3146,9 @@ msgstr "Database user"
 msgid "Database user and password"
 msgstr "Database user and password"
 
-#: ../lib/modules/pykotaUser.inc:595 ../lib/modules/pykotaUser.inc:646
-#: ../lib/modules/pykotaUser.inc:909 ../lib/modules/pykotaUser.inc:969
-#: ../lib/modules/pykotaUser.inc:993
+#: ../lib/modules/pykotaUser.inc:598 ../lib/modules/pykotaUser.inc:649
+#: ../lib/modules/pykotaUser.inc:910 ../lib/modules/pykotaUser.inc:970
+#: ../lib/modules/pykotaUser.inc:994
 msgid "Date"
 msgstr "Date"
 
@@ -3150,7 +3169,7 @@ msgstr ""
 "Days before password is to expire that user is warned of pending password "
 "expiration. If set value must be >0."
 
-#: ../templates/lists/changePassword.php:469 ../lib/types/user.inc:410
+#: ../templates/lists/changePassword.php:470 ../lib/types/user.inc:410
 msgid "Deactivate"
 msgstr "Deactivate"
 
@@ -3175,12 +3194,12 @@ msgstr "Default (\\r\\n)"
 
 #: ../lib/modules/dhcp_settings.inc:170 ../lib/modules/dhcp_settings.inc:217
 #: ../lib/modules/dhcp_settings.inc:232 ../lib/modules/dhcp_settings.inc:279
-#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:681
+#: ../lib/modules/dhcp_settings.inc:581 ../lib/modules/dhcp_settings.inc:679
 msgid "Default gateway"
 msgstr "Default gateway"
 
-#: ../templates/config/confmain.php:313
-#: ../templates/selfService/adminMain.php:460 ../help/help.inc:99
+#: ../templates/config/confmain.php:316
+#: ../templates/selfService/adminMain.php:476 ../help/help.inc:99
 msgid "Default language"
 msgstr "Default language"
 
@@ -3188,12 +3207,12 @@ msgstr "Default language"
 msgid "Default method to output a random password."
 msgstr "Default method to output a random password."
 
-#: ../templates/config/confmain.php:401 ../help/help.inc:210
+#: ../templates/config/confmain.php:404 ../help/help.inc:210
 msgid "Default password output"
 msgstr "Default password output"
 
-#: ../lib/modules/ppolicyUser.inc:64 ../lib/modules/ppolicyUser.inc:531
-#: ../lib/modules/ppolicyUser.inc:561
+#: ../lib/modules/ppolicyUser.inc:64 ../lib/modules/ppolicyUser.inc:529
+#: ../lib/modules/ppolicyUser.inc:559
 msgid "Default password policy"
 msgstr "Default password policy"
 
@@ -3201,13 +3220,14 @@ msgstr "Default password policy"
 #: ../lib/modules/asteriskAccount.inc:296
 #: ../lib/modules/asteriskAccount.inc:530
 #: ../lib/modules/asteriskAccount.inc:750
-#: ../lib/modules/asteriskAccount.inc:1015
-#: ../lib/modules/asteriskAccount.inc:1296
+#: ../lib/modules/asteriskAccount.inc:1013
+#: ../lib/modules/asteriskAccount.inc:1294
 msgid "Default user"
 msgstr "Default user"
 
-#: ../templates/masscreate.php:306 ../templates/masscreate.php:380
-#: ../lib/modules/customFields.inc:128 ../lib/modules/customFields.inc:2921
+#: ../templates/upload/masscreate.php:332
+#: ../templates/upload/masscreate.php:406 ../lib/modules/customFields.inc:128
+#: ../lib/modules/customFields.inc:2919
 msgid "Default value"
 msgstr "Default value"
 
@@ -3236,24 +3256,24 @@ msgstr ""
 "peer."
 
 #: ../lib/passwordExpirationJob.inc:464 ../lib/passwordExpirationJob.inc:511
-#: ../help/help.inc:346
+#: ../help/help.inc:358
 msgid "Delay"
 msgstr "Delay"
 
-#: ../help/help.inc:347
+#: ../help/help.inc:359
 msgid "Delay this action by a number of days after account expiry."
 msgstr "Delay this action by a number of days after account expiry."
 
-#: ../lib/types/kolabSharedFolderType.inc:91 ../lib/modules/kolabUser.inc:116
-#: ../lib/modules/kolabUser.inc:132 ../lib/modules/kolabUser.inc:136
-#: ../lib/modules/kolabUser.inc:211 ../lib/modules/kolabUser.inc:234
-#: ../lib/modules/kolabUser.inc:359 ../lib/modules/kolabUser.inc:732
-#: ../lib/modules/kolabUser.inc:804 ../lib/modules/kolabSharedFolder.inc:138
+#: ../lib/types/kolabSharedFolderType.inc:91 ../lib/modules/kolabUser.inc:119
+#: ../lib/modules/kolabUser.inc:135 ../lib/modules/kolabUser.inc:139
+#: ../lib/modules/kolabUser.inc:214 ../lib/modules/kolabUser.inc:237
+#: ../lib/modules/kolabUser.inc:362 ../lib/modules/kolabUser.inc:733
+#: ../lib/modules/kolabUser.inc:805 ../lib/modules/kolabSharedFolder.inc:138
 #: ../lib/modules/kolabSharedFolder.inc:142
 #: ../lib/modules/kolabSharedFolder.inc:226
 #: ../lib/modules/kolabSharedFolder.inc:237
 #: ../lib/modules/kolabSharedFolder.inc:320
-#: ../lib/modules/kolabSharedFolder.inc:527
+#: ../lib/modules/kolabSharedFolder.inc:525
 msgid "Delegates"
 msgstr "Delegates"
 
@@ -3265,27 +3285,27 @@ msgstr ""
 "Delegates are allowed to act on behalf of the shared folder. This property "
 "is checked when using the Kolab smtp daemon (Postfix) to send emails."
 
-#: ../templates/serverInfo.php:321 ../templates/serverInfo.php:390
-#: ../templates/multiEdit.php:130 ../templates/ou_edit.php:124
+#: ../templates/serverInfo.php:322 ../templates/serverInfo.php:391
+#: ../templates/multiEdit.php:153 ../templates/ou_edit.php:134
 #: ../templates/config/profmanage.php:279
 #: ../templates/selfService/profManage.php:240
-#: ../templates/pdfedit/pdfmain.php:214 ../templates/pdfedit/pdfmain.php:215
-#: ../templates/pdfedit/pdfmain.php:248 ../templates/delete.php:128
-#: ../templates/profedit/profilemain.php:203
-#: ../templates/profedit/profilemain.php:204
+#: ../templates/pdfedit/pdfmain.php:259 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:293 ../templates/delete.php:134
+#: ../templates/profedit/profilemain.php:244
+#: ../templates/profedit/profilemain.php:245
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:33
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:124
 #: ../lib/passwordExpirationJob.inc:469 ../lib/modules/pykotaPrinter.inc:281
-#: ../lib/modules/nisNetGroupHost.inc:107
+#: ../lib/modules/nisNetGroupHost.inc:110
 #: ../lib/modules/sambaSamAccount.inc:1559
-#: ../lib/modules/posixAccount.inc:1680 ../lib/modules/zarafaUser.inc:1475
-#: ../lib/modules/zarafaUser.inc:1526 ../lib/modules/bindDLZ.inc:1062
-#: ../lib/modules/bindDLZ.inc:1383 ../lib/modules/kolabUser.inc:794
+#: ../lib/modules/posixAccount.inc:1680 ../lib/modules/zarafaUser.inc:1476
+#: ../lib/modules/zarafaUser.inc:1527 ../lib/modules/bindDLZ.inc:1065
+#: ../lib/modules/bindDLZ.inc:1386 ../lib/modules/kolabUser.inc:795
 #: ../lib/modules/sambaGroupMapping.inc:405
-#: ../lib/modules/ldapPublicKey.inc:357 ../lib/modules/nisNetGroupUser.inc:187
-#: ../lib/modules/nisnetgroup.inc:253 ../lib/modules/inetOrgPerson.inc:2902
-#: ../lib/modules/customFields.inc:2183 ../lib/modules/customFields.inc:3675
-#: ../lib/lists.inc:509
+#: ../lib/modules/ldapPublicKey.inc:358 ../lib/modules/nisNetGroupUser.inc:190
+#: ../lib/modules/nisnetgroup.inc:256 ../lib/modules/inetOrgPerson.inc:2904
+#: ../lib/modules/customFields.inc:2181 ../lib/modules/customFields.inc:3673
+#: ../lib/lists.inc:511
 msgid "Delete"
 msgstr "Delete"
 
@@ -3324,16 +3344,16 @@ msgstr "Delete home directory"
 msgid "Delete mailbox"
 msgstr "Delete mailbox"
 
-#: ../templates/ou_edit.php:204 ../help/help.inc:303
+#: ../templates/ou_edit.php:216 ../help/help.inc:315
 msgid "Delete organisational unit"
 msgstr "Delete organizational unit"
 
 #: ../templates/3rdParty/pla/lib/functions.php:2014
-#: ../lib/modules/windowsUser.inc:1270 ../lib/modules/inetOrgPerson.inc:1679
+#: ../lib/modules/windowsUser.inc:1270 ../lib/modules/inetOrgPerson.inc:1677
 msgid "Delete photo"
 msgstr "Delete photo"
 
-#: ../lib/modules/range.inc:556
+#: ../lib/modules/range.inc:559
 msgid "Delete pool"
 msgstr "Delete pool"
 
@@ -3344,13 +3364,13 @@ msgstr "Delete pool"
 msgid "Delete profile"
 msgstr "Delete profile"
 
-#: ../lib/modules/range.inc:105 ../lib/modules/range.inc:137
-#: ../lib/modules/range.inc:532 ../lib/modules/range.inc:607
+#: ../lib/modules/range.inc:108 ../lib/modules/range.inc:140
+#: ../lib/modules/range.inc:535 ../lib/modules/range.inc:610
 msgid "Delete range"
 msgstr "Delete range"
 
-#: ../lib/modules/asteriskExtension.inc:316
-#: ../lib/modules/asteriskExtension.inc:339
+#: ../lib/modules/asteriskExtension.inc:318
+#: ../lib/modules/asteriskExtension.inc:341
 msgid "Delete rule"
 msgstr "Delete rule"
 
@@ -3358,7 +3378,7 @@ msgstr "Delete rule"
 msgid "Delete selected DHCP entries"
 msgstr "Delete selected DHCP entries"
 
-#: ../lib/types/bind.inc:162
+#: ../lib/types/bind.inc:139
 msgid "Delete selected DNS entries"
 msgstr "Delete selected DNS entries"
 
@@ -3374,7 +3394,7 @@ msgstr "Delete selected address lists"
 msgid "Delete selected aliases"
 msgstr "Delete selected aliases"
 
-#: ../lib/types/automountType.inc:218
+#: ../lib/types/automountType.inc:195
 msgid "Delete selected automount entries"
 msgstr "Delete selected automount entries"
 
@@ -3382,7 +3402,7 @@ msgstr "Delete selected automount entries"
 msgid "Delete selected billing codes"
 msgstr "Delete selected billing codes"
 
-#: ../lib/types/oracleContextType.inc:189
+#: ../lib/types/oracleContextType.inc:170
 msgid "Delete selected database entries"
 msgstr "Delete selected database entries"
 
@@ -3403,7 +3423,7 @@ msgstr "Delete selected groups"
 msgid "Delete selected hosts"
 msgstr "Delete selected hosts"
 
-#: ../lib/lists.inc:115
+#: ../lib/lists.inc:117
 msgid "Delete selected objects"
 msgstr "Delete selected objects"
 
@@ -3463,20 +3483,20 @@ msgstr "Delete whole alias entry which includes %s recipients."
 msgid "Deleted"
 msgstr "Deleted"
 
-#: ../templates/delete.php:282
+#: ../templates/delete.php:290
 #, php-format
 msgid "Deleted DN: %s"
 msgstr "Deleted DN: %s"
 
-#: ../templates/pdfedit/pdfmain.php:93
+#: ../templates/pdfedit/pdfmain.php:110
 msgid "Deleted PDF structure."
 msgstr "Deleted PDF structure."
 
-#: ../templates/profedit/profilemain.php:108
+#: ../templates/profedit/profilemain.php:127
 msgid "Deleted profile."
 msgstr "Deleted profile."
 
-#: ../lib/modules/range.inc:106
+#: ../lib/modules/range.inc:109
 msgid "Deletes an IP range."
 msgstr "Deletes an IP range."
 
@@ -3498,24 +3518,24 @@ msgstr "Deleting objects"
 #: ../lib/modules/qmailUser.inc:124 ../lib/modules/qmailUser.inc:255
 #: ../lib/modules/qmailUser.inc:382 ../lib/modules/qmailUser.inc:436
 #: ../lib/modules/qmailUser.inc:668 ../lib/modules/qmailUser.inc:907
-#: ../lib/modules/qmailUser.inc:1142
+#: ../lib/modules/qmailUser.inc:1140
 msgid "Deletion date"
 msgstr "Deletion date"
 
-#: ../lib/lists.inc:1089
+#: ../lib/lists.inc:1075
 msgid "Deletion was successful."
 msgstr "Deletion was successful."
 
 #: ../lib/modules/qmailUser.inc:215 ../lib/modules/qmailUser.inc:290
 #: ../lib/modules/qmailUser.inc:403 ../lib/modules/qmailUser.inc:639
-#: ../lib/modules/qmailUser.inc:1135
+#: ../lib/modules/qmailUser.inc:1133
 msgid "Delivery mode"
 msgstr "Delivery mode"
 
 #: ../lib/modules/qmailUser.inc:122 ../lib/modules/qmailUser.inc:175
 #: ../lib/modules/qmailUser.inc:251 ../lib/modules/qmailUser.inc:374
 #: ../lib/modules/qmailUser.inc:433 ../lib/modules/qmailUser.inc:658
-#: ../lib/modules/qmailUser.inc:1121
+#: ../lib/modules/qmailUser.inc:1119
 msgid "Delivery program"
 msgstr "Delivery program"
 
@@ -3523,32 +3543,32 @@ msgstr "Delivery program"
 #: ../lib/modules/asteriskAccount.inc:280
 #: ../lib/modules/asteriskAccount.inc:414
 #: ../lib/modules/asteriskAccount.inc:674
-#: ../lib/modules/asteriskAccount.inc:999
-#: ../lib/modules/asteriskAccount.inc:1264
+#: ../lib/modules/asteriskAccount.inc:997
+#: ../lib/modules/asteriskAccount.inc:1262
 #: ../lib/modules/dhcp_settings.inc:109
 msgid "Deny"
 msgstr "Deny"
 
-#: ../lib/modules/pykotaGroup.inc:65 ../lib/modules/pykotaUser.inc:65
+#: ../lib/modules/pykotaGroup.inc:65 ../lib/modules/pykotaUser.inc:68
 msgid "Deny printing"
 msgstr "Deny printing"
 
 #: ../lib/types/user.inc:93 ../lib/modules/windowsUser.inc:322
 #: ../lib/modules/windowsUser.inc:326 ../lib/modules/windowsUser.inc:710
 #: ../lib/modules/windowsUser.inc:756 ../lib/modules/windowsUser.inc:883
-#: ../lib/modules/windowsUser.inc:1147 ../lib/modules/windowsUser.inc:2459
-#: ../lib/modules/windowsUser.inc:3227 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:223 ../lib/modules/inetOrgPerson.inc:500
-#: ../lib/modules/inetOrgPerson.inc:622 ../lib/modules/inetOrgPerson.inc:827
-#: ../lib/modules/inetOrgPerson.inc:831 ../lib/modules/inetOrgPerson.inc:1570
-#: ../lib/modules/inetOrgPerson.inc:1573 ../lib/modules/inetOrgPerson.inc:2012
-#: ../lib/modules/inetOrgPerson.inc:2751 ../lib/modules/inetOrgPerson.inc:3682
-#: ../lib/modules/inetOrgPerson.inc:3726
+#: ../lib/modules/windowsUser.inc:1147 ../lib/modules/windowsUser.inc:2457
+#: ../lib/modules/windowsUser.inc:3225 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:221 ../lib/modules/inetOrgPerson.inc:498
+#: ../lib/modules/inetOrgPerson.inc:620 ../lib/modules/inetOrgPerson.inc:825
+#: ../lib/modules/inetOrgPerson.inc:829 ../lib/modules/inetOrgPerson.inc:1568
+#: ../lib/modules/inetOrgPerson.inc:1571 ../lib/modules/inetOrgPerson.inc:2008
+#: ../lib/modules/inetOrgPerson.inc:2747 ../lib/modules/inetOrgPerson.inc:3662
+#: ../lib/modules/inetOrgPerson.inc:3706
 msgid "Department"
 msgstr "Department"
 
 #: ../lib/modules/kolabGroup.inc:105 ../lib/modules/kolabGroup.inc:109
-#: ../lib/modules/kolabUser.inc:162 ../lib/modules/kolabUser.inc:166
+#: ../lib/modules/kolabUser.inc:165 ../lib/modules/kolabUser.inc:169
 #: ../lib/modules/kolabSharedFolder.inc:130
 #: ../lib/modules/kolabSharedFolder.inc:134
 msgid ""
@@ -3559,7 +3579,7 @@ msgstr ""
 "account (e.g. \"domain.tld\" or \"-user@domain.tld\")."
 
 #: ../lib/modules/kolabGroup.inc:96 ../lib/modules/kolabGroup.inc:100
-#: ../lib/modules/kolabUser.inc:153 ../lib/modules/kolabUser.inc:157
+#: ../lib/modules/kolabUser.inc:156 ../lib/modules/kolabUser.inc:160
 #: ../lib/modules/kolabSharedFolder.inc:121
 #: ../lib/modules/kolabSharedFolder.inc:125
 msgid ""
@@ -3569,8 +3589,8 @@ msgstr ""
 "Describes the allowed or disallowed SMTP recipient addresses for mail sent "
 "by this account (e.g. \"domain.tld\" or \"-user@domain.tld\")."
 
-#: ../templates/schema/schema.php:89 ../templates/schema/schema.php:143
-#: ../templates/schema/schema.php:346
+#: ../templates/schema/schema.php:90 ../templates/schema/schema.php:144
+#: ../templates/schema/schema.php:347
 #: ../templates/3rdParty/pla/lib/functions.php:1898
 #: ../templates/3rdParty/pla/lib/functions.php:1902
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:139
@@ -3582,67 +3602,67 @@ msgstr ""
 #: ../lib/types/dhcp.inc:96 ../lib/types/netgroup.inc:92
 #: ../lib/modules/pykotaPrinter.inc:99 ../lib/modules/pykotaPrinter.inc:153
 #: ../lib/modules/pykotaPrinter.inc:194 ../lib/modules/pykotaPrinter.inc:248
-#: ../lib/modules/pykotaPrinter.inc:588 ../lib/modules/account.inc:82
+#: ../lib/modules/pykotaPrinter.inc:586 ../lib/modules/account.inc:82
 #: ../lib/modules/account.inc:95 ../lib/modules/account.inc:105
 #: ../lib/modules/account.inc:113 ../lib/modules/account.inc:218
-#: ../lib/modules/account.inc:230 ../lib/modules/windowsHost.inc:78
+#: ../lib/modules/account.inc:228 ../lib/modules/windowsHost.inc:78
 #: ../lib/modules/windowsHost.inc:101 ../lib/modules/windowsHost.inc:120
-#: ../lib/modules/windowsHost.inc:143 ../lib/modules/windowsHost.inc:292
+#: ../lib/modules/windowsHost.inc:143 ../lib/modules/windowsHost.inc:290
 #: ../lib/modules/posixGroup.inc:198 ../lib/modules/posixGroup.inc:426
-#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:626
-#: ../lib/modules/device.inc:81 ../lib/modules/device.inc:115
-#: ../lib/modules/device.inc:130 ../lib/modules/device.inc:173
-#: ../lib/modules/device.inc:412 ../lib/modules/dhcp_settings.inc:202
+#: ../lib/modules/posixGroup.inc:480 ../lib/modules/posixGroup.inc:624
+#: ../lib/modules/device.inc:84 ../lib/modules/device.inc:118
+#: ../lib/modules/device.inc:133 ../lib/modules/device.inc:176
+#: ../lib/modules/device.inc:413 ../lib/modules/dhcp_settings.inc:202
 #: ../lib/modules/dhcp_settings.inc:222 ../lib/modules/dhcp_settings.inc:312
-#: ../lib/modules/dhcp_settings.inc:622 ../lib/modules/dhcp_settings.inc:686
+#: ../lib/modules/dhcp_settings.inc:622 ../lib/modules/dhcp_settings.inc:684
 #: ../lib/modules/pykotaGroup.inc:117 ../lib/modules/pykotaGroup.inc:166
 #: ../lib/modules/pykotaGroup.inc:188 ../lib/modules/pykotaGroup.inc:233
-#: ../lib/modules/pykotaGroup.inc:471 ../lib/modules/posixAccount.inc:515
+#: ../lib/modules/pykotaGroup.inc:469 ../lib/modules/posixAccount.inc:515
 #: ../lib/modules/windowsUser.inc:134 ../lib/modules/windowsUser.inc:442
 #: ../lib/modules/windowsUser.inc:817 ../lib/modules/windowsUser.inc:1090
-#: ../lib/modules/windowsUser.inc:2428 ../lib/modules/nisObject.inc:73
+#: ../lib/modules/windowsUser.inc:2426 ../lib/modules/nisObject.inc:73
 #: ../lib/modules/nisObject.inc:103 ../lib/modules/nisObject.inc:114
-#: ../lib/modules/nisObject.inc:155 ../lib/modules/nisObject.inc:215
+#: ../lib/modules/nisObject.inc:155 ../lib/modules/nisObject.inc:213
 #: ../lib/modules/sambaGroupMapping.inc:114
-#: ../lib/modules/sambaGroupMapping.inc:543 ../lib/modules/pykotaUser.inc:120
-#: ../lib/modules/pykotaUser.inc:226 ../lib/modules/pykotaUser.inc:277
-#: ../lib/modules/pykotaUser.inc:413 ../lib/modules/pykotaUser.inc:895
+#: ../lib/modules/sambaGroupMapping.inc:541 ../lib/modules/pykotaUser.inc:123
+#: ../lib/modules/pykotaUser.inc:229 ../lib/modules/pykotaUser.inc:280
+#: ../lib/modules/pykotaUser.inc:416 ../lib/modules/pykotaUser.inc:896
 #: ../lib/modules/automount.inc:72 ../lib/modules/automount.inc:95
 #: ../lib/modules/automount.inc:105 ../lib/modules/automount.inc:132
-#: ../lib/modules/automount.inc:186 ../lib/modules/nisnetgroup.inc:87
-#: ../lib/modules/nisnetgroup.inc:140 ../lib/modules/nisnetgroup.inc:199
-#: ../lib/modules/nisnetgroup.inc:580 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:181 ../lib/modules/inetOrgPerson.inc:338
-#: ../lib/modules/inetOrgPerson.inc:559 ../lib/modules/inetOrgPerson.inc:652
-#: ../lib/modules/inetOrgPerson.inc:1288 ../lib/modules/inetOrgPerson.inc:1291
-#: ../lib/modules/inetOrgPerson.inc:1982 ../lib/modules/inetOrgPerson.inc:2843
-#: ../lib/modules/inetOrgPerson.inc:3642 ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/automount.inc:184 ../lib/modules/nisnetgroup.inc:90
+#: ../lib/modules/nisnetgroup.inc:143 ../lib/modules/nisnetgroup.inc:202
+#: ../lib/modules/nisnetgroup.inc:581 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:179 ../lib/modules/inetOrgPerson.inc:336
+#: ../lib/modules/inetOrgPerson.inc:557 ../lib/modules/inetOrgPerson.inc:650
+#: ../lib/modules/inetOrgPerson.inc:1286 ../lib/modules/inetOrgPerson.inc:1289
+#: ../lib/modules/inetOrgPerson.inc:1978 ../lib/modules/inetOrgPerson.inc:2845
+#: ../lib/modules/inetOrgPerson.inc:3622 ../lib/modules/inetOrgPerson.inc:3694
 #: ../lib/modules/sudoRole.inc:70 ../lib/modules/sudoRole.inc:153
 #: ../lib/modules/sudoRole.inc:215 ../lib/modules/sudoRole.inc:305
-#: ../lib/modules/sudoRole.inc:754 ../lib/modules/nsview.inc:66
+#: ../lib/modules/sudoRole.inc:752 ../lib/modules/nsview.inc:66
 #: ../lib/modules/nsview.inc:79 ../lib/modules/nsview.inc:99
-#: ../lib/modules/nsview.inc:128 ../lib/modules/nsview.inc:165
+#: ../lib/modules/nsview.inc:128 ../lib/modules/nsview.inc:163
 #: ../lib/modules/oracleService.inc:69 ../lib/modules/oracleService.inc:92
 #: ../lib/modules/oracleService.inc:100 ../lib/modules/oracleService.inc:122
-#: ../lib/modules/oracleService.inc:175
-#: ../lib/modules/organizationalRole.inc:89
-#: ../lib/modules/organizationalRole.inc:123
-#: ../lib/modules/organizationalRole.inc:141
-#: ../lib/modules/organizationalRole.inc:163
-#: ../lib/modules/organizationalRole.inc:189
-#: ../lib/modules/organizationalRole.inc:506 ../lib/modules/fixed_ip.inc:110
-#: ../lib/modules/fixed_ip.inc:433 ../lib/modules/fixed_ip.inc:745
+#: ../lib/modules/oracleService.inc:173
+#: ../lib/modules/organizationalRole.inc:92
+#: ../lib/modules/organizationalRole.inc:126
+#: ../lib/modules/organizationalRole.inc:144
+#: ../lib/modules/organizationalRole.inc:166
+#: ../lib/modules/organizationalRole.inc:192
+#: ../lib/modules/organizationalRole.inc:507 ../lib/modules/fixed_ip.inc:113
+#: ../lib/modules/fixed_ip.inc:436 ../lib/modules/fixed_ip.inc:746
 #: ../lib/modules/pykotaBillingCode.inc:81
 #: ../lib/modules/pykotaBillingCode.inc:109
 #: ../lib/modules/pykotaBillingCode.inc:116
 #: ../lib/modules/pykotaBillingCode.inc:159
-#: ../lib/modules/pykotaBillingCode.inc:265
-#: ../lib/modules/windowsGroup.inc:120 ../lib/modules/windowsGroup.inc:189
-#: ../lib/modules/windowsGroup.inc:264 ../lib/modules/windowsGroup.inc:308
-#: ../lib/modules/windowsGroup.inc:912 ../lib/modules/groupOfNames.inc:89
-#: ../lib/modules/groupOfNames.inc:135 ../lib/modules/groupOfNames.inc:171
-#: ../lib/modules/groupOfNames.inc:201 ../lib/modules/groupOfNames.inc:237
-#: ../lib/modules/groupOfNames.inc:749
+#: ../lib/modules/pykotaBillingCode.inc:263
+#: ../lib/modules/windowsGroup.inc:123 ../lib/modules/windowsGroup.inc:192
+#: ../lib/modules/windowsGroup.inc:267 ../lib/modules/windowsGroup.inc:311
+#: ../lib/modules/windowsGroup.inc:913 ../lib/modules/groupOfNames.inc:92
+#: ../lib/modules/groupOfNames.inc:138 ../lib/modules/groupOfNames.inc:174
+#: ../lib/modules/groupOfNames.inc:204 ../lib/modules/groupOfNames.inc:240
+#: ../lib/modules/groupOfNames.inc:750
 msgid "Description"
 msgstr "Description"
 
@@ -3651,7 +3671,7 @@ msgstr "Description"
 msgid "Destination DN"
 msgstr "Destination DN"
 
-#: ../lib/modules/device.inc:45
+#: ../lib/modules/device.inc:48
 msgid "Device"
 msgstr "Device"
 
@@ -3660,6 +3680,11 @@ msgstr "Device"
 msgid "Disable LM hashes"
 msgstr "Disable LM hashes"
 
+#: ../templates/config/confmain.php:553
+#: ../templates/selfService/adminMain.php:525 ../help/help.inc:286
+msgid "Disable certificate check"
+msgstr "Disable certificate check"
+
 #: ../lib/modules/ddns.inc:89 ../lib/modules/ddns.inc:370
 msgid "Disable client updates"
 msgstr "Disable client updates"
@@ -3699,7 +3724,7 @@ msgstr "Disallow TGT-based tickets"
 msgid "Disallow all tickets"
 msgstr "Disallow all tickets"
 
-#: ../templates/config/conftypes.php:345 ../help/help.inc:180
+#: ../templates/config/conftypes.php:363 ../help/help.inc:180
 msgid "Disallow delete"
 msgstr "Disallow delete"
 
@@ -3741,19 +3766,19 @@ msgstr "Disallow user-to-user authentication"
 #: ../lib/modules/asteriskAccount.inc:288
 #: ../lib/modules/asteriskAccount.inc:472
 #: ../lib/modules/asteriskAccount.inc:709
-#: ../lib/modules/asteriskAccount.inc:1007
-#: ../lib/modules/asteriskAccount.inc:1280
+#: ../lib/modules/asteriskAccount.inc:1005
+#: ../lib/modules/asteriskAccount.inc:1278
 msgid "Disallowed codec"
 msgstr "Disallowed codec"
 
 #: ../lib/modules/sambaDomain.inc:113 ../lib/modules/sambaDomain.inc:193
-#: ../lib/modules/sambaDomain.inc:299 ../lib/modules/sambaDomain.inc:622
+#: ../lib/modules/sambaDomain.inc:299 ../lib/modules/sambaDomain.inc:620
 msgid "Disconnect users outside logon hours"
 msgstr "Disconnect users outside logon hours"
 
 #: ../lib/modules/sambaSamAccount.inc:238
 #: ../lib/modules/sambaSamAccount.inc:1469
-#: ../lib/modules/sambaSamAccount.inc:1942
+#: ../lib/modules/sambaSamAccount.inc:1940
 msgid "Disconnection time limit"
 msgstr "Disconnection time limit"
 
@@ -3762,11 +3787,11 @@ msgid "Disconnects users if they are logged in outside logon hours."
 msgstr "Disconnects users if they are logged in outside logon hours."
 
 #: ../templates/3rdParty/pla/lib/QueryRender.php:95
-#: ../lib/modules/zarafaGroup.inc:121 ../lib/modules/zarafaGroup.inc:768
-#: ../lib/modules/zarafaUser.inc:189 ../lib/modules/zarafaUser.inc:1861
-#: ../lib/modules/organizationalRole.inc:106
-#: ../lib/modules/organizationalRole.inc:153
-#: ../lib/modules/groupOfNames.inc:118 ../lib/modules/groupOfNames.inc:189
+#: ../lib/modules/zarafaGroup.inc:121 ../lib/modules/zarafaGroup.inc:766
+#: ../lib/modules/zarafaUser.inc:192 ../lib/modules/zarafaUser.inc:1862
+#: ../lib/modules/organizationalRole.inc:109
+#: ../lib/modules/organizationalRole.inc:156
+#: ../lib/modules/groupOfNames.inc:121 ../lib/modules/groupOfNames.inc:192
 msgid "Display format"
 msgstr "Display format"
 
@@ -3774,26 +3799,26 @@ msgstr "Display format"
 msgid "Display multiple groups as accordion"
 msgstr "Display multiple groups as accordion"
 
-#: ../templates/config/confmain.php:284 ../lib/types/group.inc:107
+#: ../templates/config/confmain.php:287 ../lib/types/group.inc:107
 #: ../lib/types/user.inc:94 ../lib/modules/sambaSamAccount.inc:111
 #: ../lib/modules/sambaSamAccount.inc:210
 #: ../lib/modules/sambaSamAccount.inc:259
 #: ../lib/modules/sambaSamAccount.inc:426
 #: ../lib/modules/sambaSamAccount.inc:1088
 #: ../lib/modules/sambaSamAccount.inc:1679
-#: ../lib/modules/sambaSamAccount.inc:1914 ../lib/modules/windowsUser.inc:138
+#: ../lib/modules/sambaSamAccount.inc:1912 ../lib/modules/windowsUser.inc:138
 #: ../lib/modules/windowsUser.inc:430 ../lib/modules/windowsUser.inc:742
 #: ../lib/modules/windowsUser.inc:818 ../lib/modules/windowsUser.inc:956
-#: ../lib/modules/windowsUser.inc:1088 ../lib/modules/windowsUser.inc:2429
+#: ../lib/modules/windowsUser.inc:1088 ../lib/modules/windowsUser.inc:2427
 #: ../lib/modules/sambaGroupMapping.inc:112
 #: ../lib/modules/sambaGroupMapping.inc:146
 #: ../lib/modules/sambaGroupMapping.inc:359
-#: ../lib/modules/sambaGroupMapping.inc:541 ../help/help.inc:190
+#: ../lib/modules/sambaGroupMapping.inc:539 ../help/help.inc:190
 msgid "Display name"
 msgstr "Display name"
 
-#: ../templates/lists/changePassword.php:329
-#: ../templates/config/confmain.php:397
+#: ../templates/lists/changePassword.php:330
+#: ../templates/config/confmain.php:400
 msgid "Display on screen"
 msgstr "Display on screen"
 
@@ -3801,7 +3826,7 @@ msgstr "Display on screen"
 msgid "Display the created entry"
 msgstr "Display the created entry"
 
-#: ../lib/modules.inc:511
+#: ../lib/modules.inc:521
 msgid ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
@@ -3809,32 +3834,32 @@ msgstr ""
 "Displayed account numbers start at \"0\". Add 2 to get the row in your "
 "spreadsheet."
 
-#: ../lib/modules/windowsGroup.inc:63
+#: ../lib/modules/windowsGroup.inc:66
 msgid "Distribution"
 msgstr "Distribution"
 
-#: ../lib/modules/posixAccount.inc:456 ../lib/modules/posixAccount.inc:1992
+#: ../lib/modules/posixAccount.inc:456 ../lib/modules/posixAccount.inc:1990
 msgid "Do not add object class"
 msgstr "Do not add object class"
 
 #: ../lib/modules/passwordSelfReset.inc:144
-#: ../lib/modules/passwordSelfReset.inc:687
+#: ../lib/modules/passwordSelfReset.inc:685
 msgid "Do not ask security question"
 msgstr "Do not ask security question"
 
-#: ../templates/ou_edit.php:116
+#: ../templates/ou_edit.php:126
 msgid "Do you really want to delete this OU?"
 msgstr "Do you really want to delete this OU?"
 
-#: ../templates/pdfedit/pdfmain.php:358
+#: ../templates/pdfedit/pdfmain.php:408
 msgid "Do you really want to delete this PDF structure?"
 msgstr "Do you really want to delete this PDF structure?"
 
-#: ../templates/profedit/profilemain.php:326
+#: ../templates/profedit/profilemain.php:370
 msgid "Do you really want to delete this profile?"
 msgstr "Do you really want to delete this profile?"
 
-#: ../lib/modules/kolabGroup.inc:285 ../lib/modules/kolabUser.inc:515
+#: ../lib/modules/kolabGroup.inc:285 ../lib/modules/kolabUser.inc:518
 #: ../lib/modules/kolabSharedFolder.inc:425
 msgid "Do you really want to mark this account for deletion?"
 msgstr "Do you really want to mark this account for deletion?"
@@ -3843,7 +3868,7 @@ msgstr "Do you really want to mark this account for deletion?"
 msgid "Do you really want to post to this mailinglist?"
 msgstr "Do you really want to post to this mailinglist?"
 
-#: ../templates/delete.php:99
+#: ../templates/delete.php:105
 msgid "Do you really want to remove the following accounts?"
 msgstr "Do you really want to remove the following accounts?"
 
@@ -3862,12 +3887,12 @@ msgstr "Do you want to make these changes?"
 #: ../lib/modules/sambaSamAccount.inc:1232
 #: ../lib/modules/sambaSamAccount.inc:1722
 #: ../lib/modules/sambaSamAccount.inc:1744
-#: ../lib/modules/sambaSamAccount.inc:1920 ../lib/modules/windowsUser.inc:126
-#: ../lib/modules/windowsUser.inc:2517
+#: ../lib/modules/sambaSamAccount.inc:1918 ../lib/modules/windowsUser.inc:126
+#: ../lib/modules/windowsUser.inc:2515
 #: ../lib/modules/sambaGroupMapping.inc:158
 #: ../lib/modules/sambaGroupMapping.inc:386
-#: ../lib/modules/sambaGroupMapping.inc:577 ../lib/modules/nisnetgroup.inc:223
-#: ../lib/modules/nisnetgroup.inc:587
+#: ../lib/modules/sambaGroupMapping.inc:575 ../lib/modules/nisnetgroup.inc:226
+#: ../lib/modules/nisnetgroup.inc:588
 msgid "Domain"
 msgstr "Domain"
 
@@ -3878,13 +3903,13 @@ msgstr "Domain KRBTGT"
 #: ../lib/types/smbDomain.inc:91 ../lib/modules/sambaDomain.inc:81
 #: ../lib/modules/sambaDomain.inc:151 ../lib/modules/sambaDomain.inc:185
 #: ../lib/modules/sambaDomain.inc:256 ../lib/modules/sambaDomain.inc:261
-#: ../lib/modules/sambaDomain.inc:601
+#: ../lib/modules/sambaDomain.inc:599
 msgid "Domain SID"
 msgstr "Domain SID"
 
 #: ../lib/modules/sambaGroupMapping.inc:125
-#: ../lib/modules/windowsGroup.inc:184 ../lib/modules/windowsGroup.inc:191
-#: ../lib/modules/windowsGroup.inc:197
+#: ../lib/modules/windowsGroup.inc:187 ../lib/modules/windowsGroup.inc:194
+#: ../lib/modules/windowsGroup.inc:200
 msgid "Domain administrators"
 msgstr "Domain administrators"
 
@@ -3930,27 +3955,27 @@ msgstr "Domain group"
 msgid "Domain guests"
 msgstr "Domain guests"
 
-#: ../lib/modules/windowsGroup.inc:66
+#: ../lib/modules/windowsGroup.inc:69
 msgid "Domain local"
 msgstr "Domain local"
 
 #: ../lib/types/smbDomain.inc:92 ../lib/modules/dhcp_settings.inc:150
 #: ../lib/modules/dhcp_settings.inc:213 ../lib/modules/dhcp_settings.inc:228
 #: ../lib/modules/dhcp_settings.inc:255 ../lib/modules/dhcp_settings.inc:569
-#: ../lib/modules/dhcp_settings.inc:677 ../lib/modules/nisNetGroupHost.inc:100
-#: ../lib/modules/nisNetGroupHost.inc:219
-#: ../lib/modules/nisNetGroupHost.inc:263
-#: ../lib/modules/nisNetGroupUser.inc:95
-#: ../lib/modules/nisNetGroupUser.inc:180
-#: ../lib/modules/nisNetGroupUser.inc:437
-#: ../lib/modules/nisNetGroupUser.inc:481 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/dhcp_settings.inc:675 ../lib/modules/nisNetGroupHost.inc:103
+#: ../lib/modules/nisNetGroupHost.inc:222
+#: ../lib/modules/nisNetGroupHost.inc:264
+#: ../lib/modules/nisNetGroupUser.inc:98
+#: ../lib/modules/nisNetGroupUser.inc:183
+#: ../lib/modules/nisNetGroupUser.inc:440
+#: ../lib/modules/nisNetGroupUser.inc:482 ../lib/modules/nisnetgroup.inc:157
 #: ../lib/modules/sambaDomain.inc:77 ../lib/modules/sambaDomain.inc:144
 #: ../lib/modules/sambaDomain.inc:184 ../lib/modules/sambaDomain.inc:241
-#: ../lib/modules/sambaDomain.inc:246 ../lib/modules/sambaDomain.inc:600
+#: ../lib/modules/sambaDomain.inc:246 ../lib/modules/sambaDomain.inc:598
 msgid "Domain name"
 msgstr "Domain name"
 
-#: ../lib/modules/nisNetGroupUser.inc:95 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/nisNetGroupUser.inc:98 ../lib/modules/nisnetgroup.inc:157
 #: ../lib/modules/sambaDomain.inc:208 ../lib/modules/sambaDomain.inc:209
 msgid "Domain name is invalid!"
 msgstr "Domain name is invalid!"
@@ -3966,17 +3991,17 @@ msgid "Domain schema admins"
 msgstr "Domain schema admins"
 
 #: ../lib/modules/sambaSamAccount.inc:406
-#: ../lib/modules/sambaSamAccount.inc:2276
+#: ../lib/modules/sambaSamAccount.inc:2274
 msgid "Domain suffix"
 msgstr "Domain suffix"
 
 #: ../lib/modules/sambaSamAccount.inc:79
-#: ../lib/modules/sambaSamAccount.inc:2183
+#: ../lib/modules/sambaSamAccount.inc:2181
 #: ../lib/modules/sambaGroupMapping.inc:61
 msgid "Domain users"
 msgstr "Domain users"
 
-#: ../lib/modules/windowsUser.inc:255 ../lib/modules/windowsUser.inc:3201
+#: ../lib/modules/windowsUser.inc:255 ../lib/modules/windowsUser.inc:3199
 msgid "Domains"
 msgstr "Domains"
 
@@ -3984,7 +4009,7 @@ msgstr "Domains"
 msgid "Don't stop on errors"
 msgstr "Don't stop on errors"
 
-#: ../templates/pdfedit/pdfpage.php:479
+#: ../templates/pdfedit/pdfpage.php:494
 msgid "Down"
 msgstr "Down"
 
@@ -3992,19 +4017,19 @@ msgstr "Down"
 msgid "Download CA certificates"
 msgstr "Download CA certificates"
 
-#: ../templates/masscreate.php:256
+#: ../templates/upload/masscreate.php:282
 msgid "Download sample CSV file"
 msgstr "Download sample CSV file"
 
-#: ../templates/multiEdit.php:166
+#: ../templates/multiEdit.php:189
 msgid "Dry run"
 msgstr "Dry run"
 
-#: ../templates/multiEdit.php:442
+#: ../templates/multiEdit.php:465
 msgid "Dry run finished."
 msgstr "Dry run finished."
 
-#: ../templates/serverInfo.php:124
+#: ../templates/serverInfo.php:125
 msgid "Dynamic subtrees"
 msgstr "Dynamic subtrees"
 
@@ -4020,15 +4045,15 @@ msgstr ""
 "Each line represents one LDAP attribute. Please see the manual for a syntax "
 "description."
 
-#: ../templates/pdfedit/pdfmain.php:211
-#: ../templates/profedit/profilemain.php:200
+#: ../templates/pdfedit/pdfmain.php:256
+#: ../templates/profedit/profilemain.php:241
 #: ../lib/modules/sambaSamAccount.inc:1237
-#: ../lib/modules/sambaSamAccount.inc:1242 ../lib/modules/windowsGroup.inc:390
-#: ../lib/modules/windowsGroup.inc:417 ../lib/lists.inc:503
+#: ../lib/modules/sambaSamAccount.inc:1242 ../lib/modules/windowsGroup.inc:393
+#: ../lib/modules/windowsGroup.inc:420 ../lib/lists.inc:505
 msgid "Edit"
 msgstr "Edit"
 
-#: ../lib/modules.inc:1387
+#: ../lib/modules.inc:1395
 msgid "Edit again"
 msgstr "Edit again"
 
@@ -4052,7 +4077,7 @@ msgstr "Edit self service"
 msgid "Edit server profiles"
 msgstr "Edit server profiles"
 
-#: ../lib/modules/nisnetgroup.inc:208
+#: ../lib/modules/nisnetgroup.inc:211
 msgid "Edit subgroups"
 msgstr "Edit subgroups"
 
@@ -4065,21 +4090,21 @@ msgstr "Edit workstations"
 #: ../lib/modules/zarafaDynamicGroup.inc:243
 #: ../lib/modules/zarafaDynamicGroup.inc:248
 #: ../lib/modules/zarafaGroup.inc:219 ../lib/modules/zarafaGroup.inc:226
-#: ../lib/modules/passwordSelfReset.inc:640
+#: ../lib/modules/passwordSelfReset.inc:638
 #: ../lib/modules/nisMailAlias.inc:344
 msgid "Email"
 msgstr "Email"
 
-#: ../lib/modules/selfRegistration.inc:523 ../lib/modules/inetOrgPerson.inc:81
+#: ../lib/modules/selfRegistration.inc:523 ../lib/modules/inetOrgPerson.inc:79
 #, php-format
 msgid "Email \"%s\" already in use."
 msgstr "Email \"%s\" already in use."
 
-#: ../templates/lists/changePassword.php:287 ../lib/modules/kolabGroup.inc:87
+#: ../templates/lists/changePassword.php:288 ../lib/modules/kolabGroup.inc:87
 #: ../lib/modules/kolabGroup.inc:91 ../lib/modules/kolabGroup.inc:155
 #: ../lib/modules/kolabGroup.inc:168 ../lib/modules/kolabGroup.inc:177
 #: ../lib/modules/kolabGroup.inc:179 ../lib/modules/kolabGroup.inc:202
-#: ../lib/modules/kolabGroup.inc:400 ../lib/modules/selfRegistration.inc:421
+#: ../lib/modules/kolabGroup.inc:398 ../lib/modules/selfRegistration.inc:421
 #: ../lib/modules/selfRegistration.inc:515
 #: ../lib/modules/selfRegistration.inc:522
 #: ../lib/modules/zarafaDynamicGroup.inc:67
@@ -4087,46 +4112,46 @@ msgstr "Email \"%s\" already in use."
 #: ../lib/modules/zarafaDynamicGroup.inc:124
 #: ../lib/modules/zarafaDynamicGroup.inc:166
 #: ../lib/modules/zarafaDynamicGroup.inc:200
-#: ../lib/modules/zarafaDynamicGroup.inc:434 ../lib/modules/qmailUser.inc:199
+#: ../lib/modules/zarafaDynamicGroup.inc:432 ../lib/modules/qmailUser.inc:199
 #: ../lib/modules/qmailUser.inc:299 ../lib/modules/qmailUser.inc:406
 #: ../lib/modules/qmailUser.inc:448 ../lib/modules/qmailUser.inc:502
-#: ../lib/modules/qmailUser.inc:1110 ../lib/modules/zarafaGroup.inc:74
+#: ../lib/modules/qmailUser.inc:1108 ../lib/modules/zarafaGroup.inc:74
 #: ../lib/modules/zarafaGroup.inc:75 ../lib/modules/zarafaGroup.inc:153
 #: ../lib/modules/zarafaGroup.inc:183 ../lib/modules/zarafaGroup.inc:198
-#: ../lib/modules/zarafaGroup.inc:627 ../lib/modules/windowsUser.inc:154
+#: ../lib/modules/zarafaGroup.inc:625 ../lib/modules/windowsUser.inc:154
 #: ../lib/modules/windowsUser.inc:484 ../lib/modules/windowsUser.inc:743
 #: ../lib/modules/windowsUser.inc:822 ../lib/modules/windowsUser.inc:978
-#: ../lib/modules/windowsUser.inc:1101 ../lib/modules/windowsUser.inc:2433
-#: ../lib/modules/pykotaUser.inc:116 ../lib/modules/pykotaUser.inc:218
-#: ../lib/modules/pykotaUser.inc:274 ../lib/modules/pykotaUser.inc:319
-#: ../lib/modules/pykotaUser.inc:409 ../lib/modules/pykotaUser.inc:893
-#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:81
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:217
-#: ../lib/modules/inetOrgPerson.inc:466 ../lib/modules/inetOrgPerson.inc:604
-#: ../lib/modules/inetOrgPerson.inc:748 ../lib/modules/inetOrgPerson.inc:752
-#: ../lib/modules/inetOrgPerson.inc:1503 ../lib/modules/inetOrgPerson.inc:1506
-#: ../lib/modules/inetOrgPerson.inc:1996 ../lib/modules/inetOrgPerson.inc:2525
-#: ../lib/modules/inetOrgPerson.inc:3672 ../lib/modules/inetOrgPerson.inc:3722
+#: ../lib/modules/windowsUser.inc:1101 ../lib/modules/windowsUser.inc:2431
+#: ../lib/modules/pykotaUser.inc:119 ../lib/modules/pykotaUser.inc:221
+#: ../lib/modules/pykotaUser.inc:277 ../lib/modules/pykotaUser.inc:322
+#: ../lib/modules/pykotaUser.inc:412 ../lib/modules/pykotaUser.inc:894
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:215
+#: ../lib/modules/inetOrgPerson.inc:464 ../lib/modules/inetOrgPerson.inc:602
+#: ../lib/modules/inetOrgPerson.inc:746 ../lib/modules/inetOrgPerson.inc:750
+#: ../lib/modules/inetOrgPerson.inc:1501 ../lib/modules/inetOrgPerson.inc:1504
+#: ../lib/modules/inetOrgPerson.inc:1992 ../lib/modules/inetOrgPerson.inc:2521
+#: ../lib/modules/inetOrgPerson.inc:3652 ../lib/modules/inetOrgPerson.inc:3702
 #: ../lib/modules/kolabSharedFolder.inc:116
 #: ../lib/modules/kolabSharedFolder.inc:181
 #: ../lib/modules/kolabSharedFolder.inc:239
 #: ../lib/modules/kolabSharedFolder.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:281
-#: ../lib/modules/kolabSharedFolder.inc:521
+#: ../lib/modules/kolabSharedFolder.inc:519
 #: ../lib/modules/asteriskVoicemail.inc:107
 #: ../lib/modules/asteriskVoicemail.inc:140
 #: ../lib/modules/asteriskVoicemail.inc:178
 #: ../lib/modules/asteriskVoicemail.inc:254
-#: ../lib/modules/asteriskVoicemail.inc:377 ../lib/modules/qmailGroup.inc:123
+#: ../lib/modules/asteriskVoicemail.inc:375 ../lib/modules/qmailGroup.inc:123
 #: ../lib/modules/qmailGroup.inc:127 ../lib/modules/qmailGroup.inc:240
 #: ../lib/modules/qmailGroup.inc:371 ../lib/modules/qmailGroup.inc:420
-#: ../lib/modules/qmailGroup.inc:457 ../lib/modules/qmailGroup.inc:1006
-#: ../lib/modules/imapAccess.inc:231 ../lib/modules/passwordSelfReset.inc:1051
-#: ../lib/modules/passwordSelfReset.inc:1242
-#: ../lib/modules/windowsGroup.inc:128 ../lib/modules/windowsGroup.inc:171
-#: ../lib/modules/windowsGroup.inc:225 ../lib/modules/windowsGroup.inc:272
-#: ../lib/modules/windowsGroup.inc:292 ../lib/modules/windowsGroup.inc:310
-#: ../lib/modules/windowsGroup.inc:914
+#: ../lib/modules/qmailGroup.inc:457 ../lib/modules/qmailGroup.inc:1004
+#: ../lib/modules/imapAccess.inc:231 ../lib/modules/passwordSelfReset.inc:1049
+#: ../lib/modules/passwordSelfReset.inc:1240
+#: ../lib/modules/windowsGroup.inc:131 ../lib/modules/windowsGroup.inc:174
+#: ../lib/modules/windowsGroup.inc:228 ../lib/modules/windowsGroup.inc:275
+#: ../lib/modules/windowsGroup.inc:295 ../lib/modules/windowsGroup.inc:313
+#: ../lib/modules/windowsGroup.inc:915
 msgid "Email address"
 msgstr "Email address"
 
@@ -4150,33 +4175,33 @@ msgstr "Email addresses that are member of this list."
 msgid "Email addresses that moderate this list (e.g. approve mails)."
 msgstr "Email addresses that moderate this list (e.g. approve mails)."
 
-#: ../lib/modules/zarafaContact.inc:89 ../lib/modules/zarafaUser.inc:138
+#: ../lib/modules/zarafaContact.inc:89 ../lib/modules/zarafaUser.inc:141
 #: ../lib/modules/windowsUser.inc:243 ../lib/modules/windowsUser.inc:247
 #: ../lib/modules/windowsUser.inc:490 ../lib/modules/windowsUser.inc:744
 #: ../lib/modules/windowsUser.inc:823 ../lib/modules/windowsUser.inc:980
-#: ../lib/modules/windowsUser.inc:1102 ../lib/modules/windowsUser.inc:2434
-#: ../lib/modules/kolabUser.inc:140 ../lib/modules/kolabSharedFolder.inc:146
+#: ../lib/modules/windowsUser.inc:1102 ../lib/modules/windowsUser.inc:2432
+#: ../lib/modules/kolabUser.inc:143 ../lib/modules/kolabSharedFolder.inc:146
 msgid "Email alias"
 msgstr "Email alias"
 
-#: ../lib/modules/zarafaContact.inc:90 ../lib/modules/zarafaUser.inc:139
+#: ../lib/modules/zarafaContact.inc:90 ../lib/modules/zarafaUser.inc:142
 #: ../lib/modules/windowsUser.inc:244 ../lib/modules/windowsUser.inc:248
-#: ../lib/modules/kolabUser.inc:141 ../lib/modules/kolabSharedFolder.inc:147
+#: ../lib/modules/kolabUser.inc:144 ../lib/modules/kolabSharedFolder.inc:147
 msgid "Email alias for this account."
 msgstr "Email alias for this account."
 
 #: ../lib/modules/zarafaContact.inc:205 ../lib/modules/zarafaContact.inc:206
-#: ../lib/modules/zarafaUser.inc:439 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:442 ../lib/modules/zarafaUser.inc:443
 #: ../lib/modules/windowsUser.inc:980 ../lib/modules/windowsUser.inc:981
-#: ../lib/modules/kolabUser.inc:247 ../lib/modules/kolabSharedFolder.inc:254
+#: ../lib/modules/kolabUser.inc:250 ../lib/modules/kolabSharedFolder.inc:254
 msgid "Email alias is invalid!"
 msgstr "Email alias is invalid!"
 
-#: ../lib/modules/kolabUser.inc:144 ../lib/modules/kolabSharedFolder.inc:150
+#: ../lib/modules/kolabUser.inc:147 ../lib/modules/kolabSharedFolder.inc:150
 msgid "Email alias list"
 msgstr "Email alias list"
 
-#: ../lib/modules/kolabUser.inc:248 ../lib/modules/kolabSharedFolder.inc:255
+#: ../lib/modules/kolabUser.inc:251 ../lib/modules/kolabSharedFolder.inc:255
 msgid "Email alias list has invalid format!"
 msgstr "Email alias list has invalid format!"
 
@@ -4187,21 +4212,21 @@ msgstr "Email alias list has invalid format!"
 #: ../lib/modules/zarafaDynamicGroup.inc:130
 #: ../lib/modules/zarafaDynamicGroup.inc:167
 #: ../lib/modules/zarafaDynamicGroup.inc:258
-#: ../lib/modules/zarafaDynamicGroup.inc:437
+#: ../lib/modules/zarafaDynamicGroup.inc:435
 #: ../lib/modules/zarafaContact.inc:153 ../lib/modules/zarafaContact.inc:193
-#: ../lib/modules/zarafaContact.inc:234 ../lib/modules/zarafaContact.inc:618
+#: ../lib/modules/zarafaContact.inc:234 ../lib/modules/zarafaContact.inc:616
 #: ../lib/modules/zarafaGroup.inc:78 ../lib/modules/zarafaGroup.inc:82
 #: ../lib/modules/zarafaGroup.inc:145 ../lib/modules/zarafaGroup.inc:180
-#: ../lib/modules/zarafaGroup.inc:237 ../lib/modules/zarafaGroup.inc:628
-#: ../lib/modules/zarafaUser.inc:206 ../lib/modules/zarafaUser.inc:392
-#: ../lib/modules/zarafaUser.inc:407 ../lib/modules/zarafaUser.inc:467
-#: ../lib/modules/zarafaUser.inc:1273 ../lib/modules/zarafaUser.inc:1537
-#: ../lib/modules/zarafaUser.inc:1850 ../lib/modules/kolabUser.inc:205
-#: ../lib/modules/kolabUser.inc:233 ../lib/modules/kolabUser.inc:351
-#: ../lib/modules/kolabUser.inc:731 ../lib/modules/kolabSharedFolder.inc:220
+#: ../lib/modules/zarafaGroup.inc:237 ../lib/modules/zarafaGroup.inc:626
+#: ../lib/modules/zarafaUser.inc:209 ../lib/modules/zarafaUser.inc:395
+#: ../lib/modules/zarafaUser.inc:410 ../lib/modules/zarafaUser.inc:470
+#: ../lib/modules/zarafaUser.inc:1274 ../lib/modules/zarafaUser.inc:1538
+#: ../lib/modules/zarafaUser.inc:1851 ../lib/modules/kolabUser.inc:208
+#: ../lib/modules/kolabUser.inc:236 ../lib/modules/kolabUser.inc:354
+#: ../lib/modules/kolabUser.inc:732 ../lib/modules/kolabSharedFolder.inc:220
 #: ../lib/modules/kolabSharedFolder.inc:236
 #: ../lib/modules/kolabSharedFolder.inc:312
-#: ../lib/modules/kolabSharedFolder.inc:526
+#: ../lib/modules/kolabSharedFolder.inc:524
 msgid "Email aliases"
 msgstr "Email aliases"
 
@@ -4211,41 +4236,41 @@ msgstr "Email format"
 
 #: ../lib/types/user.inc:95 ../lib/modules/windowsUser.inc:306
 #: ../lib/modules/windowsUser.inc:686 ../lib/modules/windowsUser.inc:874
-#: ../lib/modules/windowsUser.inc:1135 ../lib/modules/windowsUser.inc:2456
-#: ../lib/modules/windowsUser.inc:3223 ../lib/modules/inetOrgPerson.inc:354
-#: ../lib/modules/inetOrgPerson.inc:634 ../lib/modules/inetOrgPerson.inc:860
-#: ../lib/modules/inetOrgPerson.inc:1544 ../lib/modules/inetOrgPerson.inc:1547
-#: ../lib/modules/inetOrgPerson.inc:2007 ../lib/modules/inetOrgPerson.inc:3690
-#: ../lib/modules/inetOrgPerson.inc:3728
-#: ../lib/modules/passwordSelfReset.inc:643
-#: ../lib/modules/passwordSelfReset.inc:1057
-#: ../lib/modules/passwordSelfReset.inc:1246
+#: ../lib/modules/windowsUser.inc:1135 ../lib/modules/windowsUser.inc:2454
+#: ../lib/modules/windowsUser.inc:3221 ../lib/modules/inetOrgPerson.inc:352
+#: ../lib/modules/inetOrgPerson.inc:632 ../lib/modules/inetOrgPerson.inc:858
+#: ../lib/modules/inetOrgPerson.inc:1542 ../lib/modules/inetOrgPerson.inc:1545
+#: ../lib/modules/inetOrgPerson.inc:2003 ../lib/modules/inetOrgPerson.inc:3670
+#: ../lib/modules/inetOrgPerson.inc:3708
+#: ../lib/modules/passwordSelfReset.inc:641
+#: ../lib/modules/passwordSelfReset.inc:1055
+#: ../lib/modules/passwordSelfReset.inc:1244
 msgid "Employee number"
 msgstr "Employee number"
 
 #: ../lib/modules/windowsUser.inc:310 ../lib/modules/windowsUser.inc:694
 #: ../lib/modules/windowsUser.inc:768 ../lib/modules/windowsUser.inc:877
 #: ../lib/modules/windowsUser.inc:997 ../lib/modules/windowsUser.inc:1138
-#: ../lib/modules/windowsUser.inc:2457 ../lib/modules/windowsUser.inc:3224
-#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:235
-#: ../lib/modules/inetOrgPerson.inc:362 ../lib/modules/inetOrgPerson.inc:616
-#: ../lib/modules/inetOrgPerson.inc:672 ../lib/modules/inetOrgPerson.inc:1553
-#: ../lib/modules/inetOrgPerson.inc:1556 ../lib/modules/inetOrgPerson.inc:2005
-#: ../lib/modules/inetOrgPerson.inc:3678 ../lib/modules/inetOrgPerson.inc:3724
+#: ../lib/modules/windowsUser.inc:2455 ../lib/modules/windowsUser.inc:3222
+#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:233
+#: ../lib/modules/inetOrgPerson.inc:360 ../lib/modules/inetOrgPerson.inc:614
+#: ../lib/modules/inetOrgPerson.inc:670 ../lib/modules/inetOrgPerson.inc:1551
+#: ../lib/modules/inetOrgPerson.inc:1554 ../lib/modules/inetOrgPerson.inc:2001
+#: ../lib/modules/inetOrgPerson.inc:3658 ../lib/modules/inetOrgPerson.inc:3704
 msgid "Employee type"
 msgstr "Employee type"
 
-#: ../lib/modules/windowsUser.inc:311 ../lib/modules/inetOrgPerson.inc:673
+#: ../lib/modules/windowsUser.inc:311 ../lib/modules/inetOrgPerson.inc:671
 msgid "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 msgstr "Employee type: Contractor, Employee, Intern, Temp, External, ..."
 
-#: ../templates/lists/changePassword.php:538
-#: ../templates/lists/changePassword.php:545 ../templates/login.php:562
+#: ../templates/lists/changePassword.php:539
+#: ../templates/lists/changePassword.php:546 ../templates/login.php:571
 msgid "Empty password submitted. Please try again."
 msgstr "Empty password submitted. Please try again."
 
 #: ../lib/modules/passwordSelfReset.inc:100
-#: ../lib/modules/passwordSelfReset.inc:630
+#: ../lib/modules/passwordSelfReset.inc:628
 msgid "Enable password self reset link"
 msgstr "Enable password self reset link"
 
@@ -4257,7 +4282,7 @@ msgstr "Enable self registration link"
 #: ../lib/modules/freeRadius.inc:116 ../lib/modules/freeRadius.inc:162
 #: ../lib/modules/freeRadius.inc:238 ../lib/modules/freeRadius.inc:273
 #: ../lib/modules/freeRadius.inc:320 ../lib/modules/freeRadius.inc:415
-#: ../lib/modules/freeRadius.inc:709
+#: ../lib/modules/freeRadius.inc:707
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4289,7 +4314,7 @@ msgstr ""
 "\"force\" then you need to disable password hashing in your LAM server "
 "profile to change passwords with LAM."
 
-#: ../templates/multiEdit.php:317
+#: ../templates/multiEdit.php:340
 #: ../templates/3rdParty/pla/lib/export_functions.php:160
 msgid "Encountered an error while performing search."
 msgstr "Encountered an error while performing search."
@@ -4318,11 +4343,15 @@ msgstr ""
 "Encrypts sensitive data like passwords in your session. This requires the "
 "PHP MCrypt extension."
 
-#: ../lib/modules/puppetClient.inc:125 ../lib/modules/puppetClient.inc:553
+#: ../templates/pdfedit/pdfpage.php:601
+msgid "End"
+msgstr "End"
+
+#: ../lib/modules/puppetClient.inc:128 ../lib/modules/puppetClient.inc:554
 msgid "Enforce classes"
 msgstr "Enforce classes"
 
-#: ../templates/selfService/adminMain.php:464 ../help/help.inc:103
+#: ../templates/selfService/adminMain.php:480 ../help/help.inc:103
 msgid "Enforce language"
 msgstr "Enforce language"
 
@@ -4348,7 +4377,7 @@ msgstr "Enter the values you would like to add:"
 
 #: ../lib/modules/eduPerson.inc:118 ../lib/modules/eduPerson.inc:122
 #: ../lib/modules/eduPerson.inc:194 ../lib/modules/eduPerson.inc:231
-#: ../lib/modules/eduPerson.inc:344 ../lib/modules/eduPerson.inc:563
+#: ../lib/modules/eduPerson.inc:344 ../lib/modules/eduPerson.inc:561
 msgid "Entitlements"
 msgstr "Entitlements"
 
@@ -4356,7 +4385,7 @@ msgstr "Entitlements"
 msgid "Entries found"
 msgstr "Entries found"
 
-#: ../templates/serverInfo.php:269
+#: ../templates/serverInfo.php:270
 msgid "Entries sent"
 msgstr "Entries sent"
 
@@ -4378,22 +4407,22 @@ msgstr "Entry created"
 #: ../templates/3rdParty/pla/htdocs/mass_edit.php:27
 #: ../templates/3rdParty/pla/htdocs/rdelete.php:24
 #: ../templates/3rdParty/pla/htdocs/rdelete.php:56
-#: ../templates/3rdParty/pla/htdocs/mass_delete.php:33 ../lib/account.inc:815
+#: ../templates/3rdParty/pla/htdocs/mass_delete.php:33 ../lib/account.inc:821
 msgid "Entry does not exist"
 msgstr "Entry does not exist"
 
-#: ../lib/modules/puppetClient.inc:85 ../lib/modules/puppetClient.inc:89
-#: ../lib/modules/puppetClient.inc:137 ../lib/modules/puppetClient.inc:163
-#: ../lib/modules/puppetClient.inc:171 ../lib/modules/puppetClient.inc:251
-#: ../lib/modules/puppetClient.inc:408
+#: ../lib/modules/puppetClient.inc:88 ../lib/modules/puppetClient.inc:92
+#: ../lib/modules/puppetClient.inc:140 ../lib/modules/puppetClient.inc:166
+#: ../lib/modules/puppetClient.inc:174 ../lib/modules/puppetClient.inc:254
+#: ../lib/modules/puppetClient.inc:409
 msgid "Environment"
 msgstr "Environment"
 
-#: ../templates/schema/schema.php:166
+#: ../templates/schema/schema.php:167
 msgid "Equality"
 msgstr "Equality"
 
-#: ../lib/modules/zarafaUser.inc:558 ../lib/modules/zarafaUser.inc:1287
+#: ../lib/modules/zarafaUser.inc:561 ../lib/modules/zarafaUser.inc:1288
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -4413,17 +4442,17 @@ msgstr "Error"
 msgid "Error number"
 msgstr "Error number"
 
-#: ../lib/modules/mitKerberos.inc:1192 ../lib/modules/heimdalKerberos.inc:1052
+#: ../lib/modules/mitKerberos.inc:1190 ../lib/modules/heimdalKerberos.inc:1050
 msgid "Error while changing Kerberos password."
 msgstr "Error while changing Kerberos password."
 
-#: ../templates/delete.php:290
+#: ../templates/delete.php:298
 #, php-format
 msgid "Error while deleting DN: %s"
 msgstr "Error while deleting DN: %s"
 
 #: ../templates/login.php:236
-#: ../templates/selfService/selfServiceLogin.php:307 ../lib/env.inc:245
+#: ../templates/selfService/selfServiceLogin.php:323 ../lib/env.inc:245
 msgid "Evaluation Licence"
 msgstr "Evaluation License"
 
@@ -4438,12 +4467,13 @@ msgstr ""
 #: ../lib/modules/customScripts.inc:67 ../lib/modules/customScripts.inc:80
 #: ../lib/modules/selfRegistration.inc:82 ../lib/modules/zarafaContact.inc:103
 #: ../lib/modules/zarafaGroup.inc:104 ../lib/modules/dhcp_settings.inc:566
-#: ../lib/modules/zarafaUser.inc:160 ../help/help.inc:74 ../help/help.inc:80
+#: ../lib/modules/zarafaUser.inc:163 ../help/help.inc:74 ../help/help.inc:80
 #: ../help/help.inc:90 ../help/help.inc:95 ../help/help.inc:119
 msgid "Example"
 msgstr "Example"
 
-#: ../templates/masscreate.php:302 ../templates/masscreate.php:376
+#: ../templates/upload/masscreate.php:328
+#: ../templates/upload/masscreate.php:402
 msgid "Example value"
 msgstr "Example value"
 
@@ -4451,11 +4481,11 @@ msgstr "Example value"
 msgid "Examples"
 msgstr "Examples"
 
-#: ../templates/config/confmain.php:357
+#: ../templates/config/confmain.php:360
 msgid "Execute"
 msgstr "Execute"
 
-#: ../templates/tests/lamdaemonTest.php:269
+#: ../templates/tests/lamdaemonTest.php:271
 msgid "Execute lamdaemon"
 msgstr "Execute lamdaemon"
 
@@ -4466,13 +4496,13 @@ msgstr "Existing server profiles"
 #: ../lib/env.inc:162 ../lib/modules/freeRadius.inc:108
 #: ../lib/modules/freeRadius.inc:222 ../lib/modules/freeRadius.inc:267
 #: ../lib/modules/freeRadius.inc:314 ../lib/modules/freeRadius.inc:520
-#: ../lib/modules/freeRadius.inc:702
+#: ../lib/modules/freeRadius.inc:700
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: ../lib/modules/bindDLZ.inc:211 ../lib/modules/bindDLZ.inc:314
-#: ../lib/modules/bindDLZ.inc:426 ../lib/modules/bindDLZ.inc:519
-#: ../lib/modules/bindDLZ.inc:1022 ../lib/modules/bindDLZ.inc:1551
+#: ../lib/modules/bindDLZ.inc:214 ../lib/modules/bindDLZ.inc:317
+#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:1025 ../lib/modules/bindDLZ.inc:1552
 msgid "Expiration time"
 msgstr "Expiration time"
 
@@ -4480,8 +4510,8 @@ msgstr "Expiration time"
 #: ../lib/modules/asteriskAccount.inc:291
 #: ../lib/modules/asteriskAccount.inc:494
 #: ../lib/modules/asteriskAccount.inc:721
-#: ../lib/modules/asteriskAccount.inc:1010
-#: ../lib/modules/asteriskAccount.inc:1286
+#: ../lib/modules/asteriskAccount.inc:1008
+#: ../lib/modules/asteriskAccount.inc:1284
 msgid "Expiration timestamp"
 msgstr "Expiration timestamp"
 
@@ -4491,11 +4521,11 @@ msgstr "Expiration timestamp (\"regseconds\" option)."
 
 #: ../lib/types/ppolicyType.inc:86 ../lib/modules/ppolicy.inc:116
 #: ../lib/modules/ppolicy.inc:148 ../lib/modules/ppolicy.inc:174
-#: ../lib/modules/ppolicy.inc:212 ../lib/modules/ppolicy.inc:480
+#: ../lib/modules/ppolicy.inc:212 ../lib/modules/ppolicy.inc:478
 msgid "Expire warning"
 msgstr "Expire warning"
 
-#: ../templates/config/mainlogin.php:138
+#: ../templates/config/mainlogin.php:143
 msgid "Expired licence"
 msgstr "Expired license"
 
@@ -4509,7 +4539,7 @@ msgstr "Expired license"
 msgid "Export"
 msgstr "Export"
 
-#: ../templates/pdfedit/pdfmain.php:226 ../templates/pdfedit/pdfmain.php:227
+#: ../templates/pdfedit/pdfmain.php:271 ../templates/pdfedit/pdfmain.php:272
 #: ../help/help.inc:250
 msgid "Export PDF structure"
 msgstr "Export PDF structure"
@@ -4518,8 +4548,8 @@ msgstr "Export PDF structure"
 msgid "Export format"
 msgstr "Export format"
 
-#: ../templates/profedit/profilemain.php:214
-#: ../templates/profedit/profilemain.php:215 ../help/help.inc:232
+#: ../templates/profedit/profilemain.php:255
+#: ../templates/profedit/profilemain.php:256 ../help/help.inc:232
 msgid "Export profile"
 msgstr "Export profile"
 
@@ -4528,12 +4558,12 @@ msgstr "Export profile"
 msgid "Export subtree"
 msgstr "Export subtree"
 
-#: ../templates/pdfedit/pdfmain.php:121
-#: ../templates/profedit/profilemain.php:137
+#: ../templates/pdfedit/pdfmain.php:488
+#: ../templates/profedit/profilemain.php:449
 msgid "Export successful"
 msgstr "Export successful"
 
-#: ../templates/serverInfo.php:349
+#: ../templates/serverInfo.php:350
 msgid "Extended"
 msgstr "Extended"
 
@@ -4543,25 +4573,25 @@ msgid "Extension count: %s"
 msgstr "Extension count: %s"
 
 #: ../lib/types/asteriskExt.inc:94 ../lib/types/asteriskExt.inc:158
-#: ../lib/modules/asteriskExtension.inc:102
-#: ../lib/modules/asteriskExtension.inc:137
-#: ../lib/modules/asteriskExtension.inc:145
-#: ../lib/modules/asteriskExtension.inc:289
-#: ../lib/modules/asteriskExtension.inc:293
+#: ../lib/modules/asteriskExtension.inc:104
+#: ../lib/modules/asteriskExtension.inc:139
+#: ../lib/modules/asteriskExtension.inc:147
+#: ../lib/modules/asteriskExtension.inc:291
+#: ../lib/modules/asteriskExtension.inc:295
 #: ../lib/modules/asteriskExtension.inc:816
 msgid "Extension name"
 msgstr "Extension name"
 
-#: ../lib/modules/asteriskExtension.inc:114
-#: ../lib/modules/asteriskExtension.inc:138
-#: ../lib/modules/asteriskExtension.inc:159
-#: ../lib/modules/asteriskExtension.inc:233
-#: ../lib/modules/asteriskExtension.inc:481
+#: ../lib/modules/asteriskExtension.inc:116
+#: ../lib/modules/asteriskExtension.inc:140
+#: ../lib/modules/asteriskExtension.inc:161
+#: ../lib/modules/asteriskExtension.inc:235
+#: ../lib/modules/asteriskExtension.inc:483
 #: ../lib/modules/asteriskExtension.inc:817
 msgid "Extension owners"
 msgstr "Extension owners"
 
-#: ../lib/modules/asteriskExtension.inc:190
+#: ../lib/modules/asteriskExtension.inc:192
 msgid "Extension with this name already exists."
 msgstr "Extension with this name already exists."
 
@@ -4572,49 +4602,47 @@ msgstr "Failed"
 
 #: ../lib/modules/mitKerberos.inc:128 ../lib/modules/mitKerberos.inc:252
 #: ../lib/modules/mitKerberos.inc:298 ../lib/modules/mitKerberos.inc:345
-#: ../lib/modules/mitKerberos.inc:782
+#: ../lib/modules/mitKerberos.inc:780
 msgid "Failed logins"
 msgstr "Failed logins"
 
-#: ../templates/initsuff.php:156
+#: ../lib/profiles.inc:199 ../lib/profiles.inc:209 ../lib/profiles.inc:222
+#: ../lib/profiles.inc:231 ../lib/pdfstruct.inc:215 ../lib/pdfstruct.inc:225
+#: ../lib/pdfstruct.inc:238 ../lib/pdfstruct.inc:247
+msgid "Failed to copy"
+msgstr "Failed to copy"
+
+#: ../templates/initsuff.php:157
 msgid "Failed to create entry!"
 msgstr "Failed to create entry!"
 
-#: ../lib/profiles.inc:190 ../lib/pdfstruct.inc:224
-msgid "Failed to export!"
-msgstr "Failed to export!"
-
-#: ../lib/profiles.inc:197 ../lib/pdfstruct.inc:231
-msgid "Failed to import!"
-msgstr "Failed to import!"
-
-#: ../lib/modules/range.inc:121 ../lib/modules/range.inc:567
+#: ../lib/modules/range.inc:124 ../lib/modules/range.inc:570
 msgid "Failover peer"
 msgstr "Failover peer"
 
 #: ../lib/types/ppolicyType.inc:85 ../lib/modules/ppolicy.inc:112
 #: ../lib/modules/ppolicy.inc:153 ../lib/modules/ppolicy.inc:173
-#: ../lib/modules/ppolicy.inc:276 ../lib/modules/ppolicy.inc:479
+#: ../lib/modules/ppolicy.inc:276 ../lib/modules/ppolicy.inc:477
 msgid "Failure count interval"
 msgstr "Failure count interval"
 
 #: ../lib/modules/windowsUser.inc:194 ../lib/modules/windowsUser.inc:597
 #: ../lib/modules/windowsUser.inc:850 ../lib/modules/windowsUser.inc:917
 #: ../lib/modules/windowsUser.inc:964 ../lib/modules/windowsUser.inc:1121
-#: ../lib/modules/windowsUser.inc:2443 ../lib/modules/windowsUser.inc:2613
-#: ../lib/modules/windowsUser.inc:3210 ../lib/modules/inetOrgPerson.inc:76
-#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:214
-#: ../lib/modules/inetOrgPerson.inc:450 ../lib/modules/inetOrgPerson.inc:598
-#: ../lib/modules/inetOrgPerson.inc:732 ../lib/modules/inetOrgPerson.inc:736
-#: ../lib/modules/inetOrgPerson.inc:1487 ../lib/modules/inetOrgPerson.inc:1490
-#: ../lib/modules/inetOrgPerson.inc:1998 ../lib/modules/inetOrgPerson.inc:2580
-#: ../lib/modules/inetOrgPerson.inc:3668 ../lib/modules/inetOrgPerson.inc:3721
+#: ../lib/modules/windowsUser.inc:2441 ../lib/modules/windowsUser.inc:2611
+#: ../lib/modules/windowsUser.inc:3208 ../lib/modules/inetOrgPerson.inc:74
+#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:212
+#: ../lib/modules/inetOrgPerson.inc:448 ../lib/modules/inetOrgPerson.inc:596
+#: ../lib/modules/inetOrgPerson.inc:730 ../lib/modules/inetOrgPerson.inc:734
+#: ../lib/modules/inetOrgPerson.inc:1485 ../lib/modules/inetOrgPerson.inc:1488
+#: ../lib/modules/inetOrgPerson.inc:1994 ../lib/modules/inetOrgPerson.inc:2576
+#: ../lib/modules/inetOrgPerson.inc:3648 ../lib/modules/inetOrgPerson.inc:3701
 msgid "Fax number"
 msgstr "Fax number"
 
-#: ../lib/modules/zarafaUser.inc:169 ../lib/modules/zarafaUser.inc:398
-#: ../lib/modules/zarafaUser.inc:669 ../lib/modules/zarafaUser.inc:1326
-#: ../lib/modules/zarafaUser.inc:1368 ../lib/modules/zarafaUser.inc:1848
+#: ../lib/modules/zarafaUser.inc:172 ../lib/modules/zarafaUser.inc:401
+#: ../lib/modules/zarafaUser.inc:672 ../lib/modules/zarafaUser.inc:1327
+#: ../lib/modules/zarafaUser.inc:1369 ../lib/modules/zarafaUser.inc:1849
 msgid "Features"
 msgstr "Features"
 
@@ -4625,15 +4653,15 @@ msgstr "Features"
 msgid "File"
 msgstr "File"
 
-#: ../lib/pdfstruct.inc:282
+#: ../lib/pdfstruct.inc:293
 msgid "File does not exist."
 msgstr "File does not exist."
 
-#: ../lib/modules/customFields.inc:164 ../lib/modules/customFields.inc:3507
+#: ../lib/modules/customFields.inc:164 ../lib/modules/customFields.inc:3505
 msgid "File extension"
 msgstr "File extension"
 
-#: ../lib/modules/windowsUser.inc:1005 ../lib/modules/inetOrgPerson.inc:104
+#: ../lib/modules/windowsUser.inc:1005 ../lib/modules/inetOrgPerson.inc:102
 #, php-format
 msgid "File is too large. Maximum allowed size is %s kB."
 msgstr "File is too large. Maximum allowed size is %s kB."
@@ -4656,13 +4684,13 @@ msgstr ""
 
 #: ../lib/modules/zarafaServer.inc:76 ../lib/modules/zarafaServer.inc:112
 #: ../lib/modules/zarafaServer.inc:137 ../lib/modules/zarafaServer.inc:177
-#: ../lib/modules/zarafaServer.inc:219 ../lib/modules/zarafaServer.inc:359
+#: ../lib/modules/zarafaServer.inc:219 ../lib/modules/zarafaServer.inc:357
 msgid "File path"
 msgstr "File path"
 
-#: ../templates/masscreate.php:243 ../lib/tools/fileUpload.inc:44
-#: ../lib/modules/ldapPublicKey.inc:91 ../lib/modules/customFields.inc:3493
-#: ../lib/lists.inc:796
+#: ../templates/upload/masscreate.php:269 ../lib/tools/fileUpload.inc:45
+#: ../lib/modules/ldapPublicKey.inc:94 ../lib/modules/customFields.inc:3491
+#: ../lib/lists.inc:797
 msgid "File upload"
 msgstr "File upload"
 
@@ -4674,29 +4702,29 @@ msgstr "File upload"
 #: ../lib/modules/zarafaDynamicGroup.inc:158
 #: ../lib/modules/zarafaDynamicGroup.inc:171
 #: ../lib/modules/zarafaDynamicGroup.inc:239
-#: ../lib/modules/zarafaDynamicGroup.inc:436
+#: ../lib/modules/zarafaDynamicGroup.inc:434
 #: ../lib/modules/zarafaContact.inc:97 ../lib/modules/posixGroup.inc:337
-#: ../lib/modules/posixGroup.inc:529 ../lib/modules/nisNetGroupHost.inc:117
+#: ../lib/modules/posixGroup.inc:529 ../lib/modules/nisNetGroupHost.inc:120
 #: ../lib/modules/zarafaAddressList.inc:79
 #: ../lib/modules/zarafaAddressList.inc:134
 #: ../lib/modules/zarafaAddressList.inc:145
 #: ../lib/modules/zarafaAddressList.inc:206
-#: ../lib/modules/zarafaAddressList.inc:336 ../lib/modules/zarafaUser.inc:154
+#: ../lib/modules/zarafaAddressList.inc:334 ../lib/modules/zarafaUser.inc:157
 #: ../lib/modules/sambaGroupMapping.inc:170
 #: ../lib/modules/sambaGroupMapping.inc:483
-#: ../lib/modules/nisNetGroupUser.inc:197 ../lib/modules/nisnetgroup.inc:104
-#: ../lib/modules/nisnetgroup.inc:477 ../lib/modules/groupOfNamesUser.inc:170
+#: ../lib/modules/nisNetGroupUser.inc:200 ../lib/modules/nisnetgroup.inc:107
+#: ../lib/modules/nisnetgroup.inc:480 ../lib/modules/groupOfNamesUser.inc:170
 #: ../lib/modules/nsview.inc:65 ../lib/modules/nsview.inc:75
 #: ../lib/modules/nsview.inc:93 ../lib/modules/nsview.inc:112
-#: ../lib/modules/nsview.inc:126 ../lib/modules/nsview.inc:164
-#: ../lib/modules/organizationalRole.inc:101
-#: ../lib/modules/organizationalRole.inc:288
-#: ../lib/modules/organizationalRole.inc:378
-#: ../lib/modules/windowsGroup.inc:655 ../lib/modules/groupOfNames.inc:113
-#: ../lib/modules/groupOfNames.inc:347 ../lib/modules/groupOfNames.inc:437
-#: ../lib/modules/groupOfNames.inc:502 ../lib/modules/groupOfNames.inc:592
+#: ../lib/modules/nsview.inc:126 ../lib/modules/nsview.inc:162
+#: ../lib/modules/organizationalRole.inc:104
+#: ../lib/modules/organizationalRole.inc:291
+#: ../lib/modules/organizationalRole.inc:381
+#: ../lib/modules/windowsGroup.inc:658 ../lib/modules/groupOfNames.inc:116
+#: ../lib/modules/groupOfNames.inc:350 ../lib/modules/groupOfNames.inc:440
+#: ../lib/modules/groupOfNames.inc:505 ../lib/modules/groupOfNames.inc:595
 #: ../lib/modules/nisMailAlias.inc:93 ../lib/modules/nisMailAlias.inc:373
-#: ../lib/lists.inc:384 ../help/help.inc:170
+#: ../lib/lists.inc:386 ../help/help.inc:170
 msgid "Filter"
 msgstr "Filter"
 
@@ -4704,7 +4732,7 @@ msgstr "Filter"
 msgid "Filter performed"
 msgstr "Filter performed"
 
-#: ../templates/multiEdit.php:519
+#: ../templates/multiEdit.php:542
 msgid "Finished all operations."
 msgstr "Finished all operations."
 
@@ -4712,21 +4740,21 @@ msgstr "Finished all operations."
 #: ../lib/modules/selfRegistration.inc:223 ../lib/modules/windowsUser.inc:142
 #: ../lib/modules/windowsUser.inc:412 ../lib/modules/windowsUser.inc:819
 #: ../lib/modules/windowsUser.inc:958 ../lib/modules/windowsUser.inc:1085
-#: ../lib/modules/windowsUser.inc:2430 ../lib/modules/inetOrgPerson.inc:66
-#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:315
-#: ../lib/modules/inetOrgPerson.inc:555 ../lib/modules/inetOrgPerson.inc:664
-#: ../lib/modules/inetOrgPerson.inc:1251 ../lib/modules/inetOrgPerson.inc:1254
-#: ../lib/modules/inetOrgPerson.inc:1984 ../lib/modules/inetOrgPerson.inc:2503
-#: ../lib/modules/inetOrgPerson.inc:3715
+#: ../lib/modules/windowsUser.inc:2428 ../lib/modules/inetOrgPerson.inc:64
+#: ../lib/modules/inetOrgPerson.inc:157 ../lib/modules/inetOrgPerson.inc:313
+#: ../lib/modules/inetOrgPerson.inc:553 ../lib/modules/inetOrgPerson.inc:662
+#: ../lib/modules/inetOrgPerson.inc:1249 ../lib/modules/inetOrgPerson.inc:1252
+#: ../lib/modules/inetOrgPerson.inc:1980 ../lib/modules/inetOrgPerson.inc:2499
+#: ../lib/modules/inetOrgPerson.inc:3695
 msgid "First name"
 msgstr "First name"
 
 #: ../lib/modules/windowsUser.inc:958 ../lib/modules/windowsUser.inc:959
-#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
+#: ../lib/modules/inetOrgPerson.inc:64 ../lib/modules/inetOrgPerson.inc:65
 msgid "First name contains invalid characters!"
 msgstr "First name contains invalid characters!"
 
-#: ../lib/modules/windowsUser.inc:143 ../lib/modules/inetOrgPerson.inc:665
+#: ../lib/modules/windowsUser.inc:143 ../lib/modules/inetOrgPerson.inc:663
 msgid "First name of user. Only letters, - and spaces are allowed."
 msgstr "First name of user. Only letters, - and spaces are allowed."
 
@@ -4734,28 +4762,28 @@ msgstr "First name of user. Only letters, - and spaces are allowed."
 msgid "Fix IP addresses"
 msgstr "Fix IP addresses"
 
-#: ../templates/config/confmain.php:491
+#: ../templates/config/confmain.php:494
 msgid "Fixed list"
 msgstr "Fixed list"
 
-#: ../lib/modules/posixGroup.inc:567 ../lib/modules/posixAccount.inc:1888
+#: ../lib/modules/posixGroup.inc:567 ../lib/modules/posixAccount.inc:1886
 msgid "Fixed range"
 msgstr "Fixed range"
 
-#: ../templates/pdfedit/pdfpage.php:465
+#: ../templates/pdfedit/pdfpage.php:480
 msgid "Folding marks"
 msgstr "Folding marks"
 
-#: ../templates/config/confmain.php:287
-#: ../templates/selfService/adminMain.php:434 ../help/help.inc:85
+#: ../templates/config/confmain.php:290
+#: ../templates/selfService/adminMain.php:450 ../help/help.inc:85
 msgid "Follow referrals"
 msgstr "Follow referrals"
 
-#: ../lib/modules/kolabUser.inc:125
+#: ../lib/modules/kolabUser.inc:128
 msgid "For automatic invitation handling."
 msgstr "For automatic invitation handling."
 
-#: ../lib/modules/nisnetgroup.inc:101
+#: ../lib/modules/nisnetgroup.inc:104
 msgid ""
 "For the upload please specify the entries in the format \"(HOST,USER,"
 "DOMAIN)\". Multiple entries are separated by semicolon."
@@ -4763,15 +4791,15 @@ msgstr ""
 "For the upload please specify the entries in the format \"(HOST,USER,"
 "DOMAIN)\". Multiple entries are separated by semicolon."
 
-#: ../templates/lists/changePassword.php:242
+#: ../templates/lists/changePassword.php:243
 #: ../lib/modules/mitKerberos.inc:183 ../lib/modules/mitKerberos.inc:417
 #: ../lib/modules/shadowAccount.inc:370 ../lib/modules/heimdalKerberos.inc:127
-#: ../lib/modules/heimdalKerberos.inc:348 ../lib/modules.inc:1086
+#: ../lib/modules/heimdalKerberos.inc:348 ../lib/modules.inc:1094
 #: ../help/help.inc:244
 msgid "Force password change"
 msgstr "Force password change"
 
-#: ../templates/config/confmain.php:411 ../help/help.inc:212
+#: ../templates/config/confmain.php:414 ../help/help.inc:212
 msgid "Force password change by default"
 msgstr "Force password change by default"
 
@@ -4779,17 +4807,17 @@ msgstr "Force password change by default"
 msgid "Force sync with group of names"
 msgstr "Force sync with group of names"
 
-#: ../lib/modules/passwordSelfReset.inc:984
+#: ../lib/modules/passwordSelfReset.inc:982
 msgid "Forgot password?"
 msgstr "Forgot password?"
 
-#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:290
+#: ../templates/3rdParty/pla/lib/QueryRender.php:484 ../help/help.inc:302
 msgid "Format"
 msgstr "Format"
 
 #: ../lib/modules/qmailUser.inc:207 ../lib/modules/qmailUser.inc:277
 #: ../lib/modules/qmailUser.inc:401 ../lib/modules/qmailUser.inc:452
-#: ../lib/modules/qmailUser.inc:556 ../lib/modules/qmailUser.inc:1112
+#: ../lib/modules/qmailUser.inc:556 ../lib/modules/qmailUser.inc:1110
 msgid "Forwarding address"
 msgstr "Forwarding address"
 
@@ -4797,11 +4825,11 @@ msgstr "Forwarding address"
 msgid "Forwards all incoming messages for this user to this address."
 msgstr "Forwards all incoming messages for this user to this address."
 
-#: ../lib/modules/pykotaGroup.inc:64 ../lib/modules/pykotaUser.inc:64
+#: ../lib/modules/pykotaGroup.inc:64 ../lib/modules/pykotaUser.inc:67
 msgid "Free printing"
 msgstr "Free printing"
 
-#: ../lib/modules/freeRadius.inc:77 ../lib/modules/freeRadius.inc:824
+#: ../lib/modules/freeRadius.inc:77 ../lib/modules/freeRadius.inc:822
 msgid "FreeRadius"
 msgstr "FreeRadius"
 
@@ -4809,17 +4837,17 @@ msgstr "FreeRadius"
 msgid "Friday"
 msgstr "Friday"
 
-#: ../templates/config/confmain.php:420 ../lib/passwordExpirationJob.inc:81
+#: ../templates/config/confmain.php:423 ../lib/passwordExpirationJob.inc:81
 #: ../lib/passwordExpirationJob.inc:119 ../lib/modules/selfRegistration.inc:90
 #: ../lib/modules/selfRegistration.inc:235
 #: ../lib/modules/passwordSelfReset.inc:120
-#: ../lib/modules/passwordSelfReset.inc:679
-#: ../lib/modules/passwordSelfReset.inc:699 ../help/help.inc:284
-#: ../help/help.inc:316
+#: ../lib/modules/passwordSelfReset.inc:677
+#: ../lib/modules/passwordSelfReset.inc:697 ../help/help.inc:296
+#: ../help/help.inc:328
 msgid "From address"
 msgstr "From address"
 
-#: ../templates/config/confmain.php:623
+#: ../templates/config/confmain.php:660
 msgid "From address for password mails is invalid."
 msgstr "From address for password mails is invalid."
 
@@ -4827,8 +4855,8 @@ msgstr "From address for password mails is invalid."
 #: ../lib/modules/asteriskAccount.inc:275
 #: ../lib/modules/asteriskAccount.inc:377
 #: ../lib/modules/asteriskAccount.inc:636
-#: ../lib/modules/asteriskAccount.inc:994
-#: ../lib/modules/asteriskAccount.inc:1254
+#: ../lib/modules/asteriskAccount.inc:992
+#: ../lib/modules/asteriskAccount.inc:1252
 msgid "From domain"
 msgstr "From domain"
 
@@ -4840,8 +4868,8 @@ msgstr "From domain setting for this account."
 #: ../lib/modules/asteriskAccount.inc:274
 #: ../lib/modules/asteriskAccount.inc:370
 #: ../lib/modules/asteriskAccount.inc:632
-#: ../lib/modules/asteriskAccount.inc:993
-#: ../lib/modules/asteriskAccount.inc:1252
+#: ../lib/modules/asteriskAccount.inc:991
+#: ../lib/modules/asteriskAccount.inc:1250
 msgid "From user"
 msgstr "From user"
 
@@ -4853,17 +4881,17 @@ msgstr "From user setting for this account."
 #: ../lib/modules/asteriskAccount.inc:276
 #: ../lib/modules/asteriskAccount.inc:384
 #: ../lib/modules/asteriskAccount.inc:640
-#: ../lib/modules/asteriskAccount.inc:995
-#: ../lib/modules/asteriskAccount.inc:1256
+#: ../lib/modules/asteriskAccount.inc:993
+#: ../lib/modules/asteriskAccount.inc:1254
 msgid "Full contact"
 msgstr "Full contact"
 
-#: ../templates/lists/changePassword.php:285
+#: ../templates/lists/changePassword.php:286
 #: ../lib/modules/asteriskVoicemail.inc:103
 #: ../lib/modules/asteriskVoicemail.inc:139
 #: ../lib/modules/asteriskVoicemail.inc:172
 #: ../lib/modules/asteriskVoicemail.inc:252
-#: ../lib/modules/asteriskVoicemail.inc:374
+#: ../lib/modules/asteriskVoicemail.inc:372
 msgid "Full name"
 msgstr "Full name"
 
@@ -4876,7 +4904,7 @@ msgstr "Full name for Asterisk voicemail mailbox."
 msgid "Function"
 msgstr "Function"
 
-#: ../lib/modules/windowsUser.inc:462 ../lib/modules/inetOrgPerson.inc:396
+#: ../lib/modules/windowsUser.inc:462 ../lib/modules/inetOrgPerson.inc:394
 msgid "GB-12345"
 msgstr "GB-12345"
 
@@ -4888,18 +4916,18 @@ msgstr "GID generator"
 #: ../lib/types/user.inc:97 ../lib/modules/qmailUser.inc:114
 #: ../lib/modules/qmailUser.inc:235 ../lib/modules/qmailUser.inc:341
 #: ../lib/modules/qmailUser.inc:421 ../lib/modules/qmailUser.inc:591
-#: ../lib/modules/qmailUser.inc:1114 ../lib/modules/posixGroup.inc:188
+#: ../lib/modules/qmailUser.inc:1112 ../lib/modules/posixGroup.inc:188
 #: ../lib/modules/posixGroup.inc:416 ../lib/modules/posixGroup.inc:432
 #: ../lib/modules/posixGroup.inc:476 ../lib/modules/posixGroup.inc:496
-#: ../lib/modules/posixGroup.inc:625 ../lib/modules/posixGroup.inc:659
+#: ../lib/modules/posixGroup.inc:623 ../lib/modules/posixGroup.inc:657
 #: ../lib/modules/posixAccount.inc:125 ../lib/modules/posixAccount.inc:354
-#: ../lib/modules/posixAccount.inc:1850
+#: ../lib/modules/posixAccount.inc:1848
 #: ../lib/modules/sambaGroupMapping.inc:110
-#: ../lib/modules/sambaGroupMapping.inc:539
+#: ../lib/modules/sambaGroupMapping.inc:537
 msgid "GID number"
 msgstr "GID number"
 
-#: ../lib/modules/posixGroup.inc:659
+#: ../lib/modules/posixGroup.inc:657
 msgid ""
 "GID number has changed. Please select checkbox to change GID number of users "
 "and hosts."
@@ -4916,7 +4944,7 @@ msgstr ""
 "GID number has changed. To keep file ownership you have to run the following "
 "command as root: 'find / -gid %s -uid %s -exec chgrp %s {} \\;'"
 
-#: ../lib/modules/posixGroup.inc:666
+#: ../lib/modules/posixGroup.inc:664
 msgid "GID number has to be a numeric value!"
 msgstr "GID number has to be a numeric value!"
 
@@ -4927,7 +4955,7 @@ msgstr "GID number is already in use."
 #: ../lib/modules/posixAccount.inc:297 ../lib/modules/posixAccount.inc:339
 #: ../lib/modules/posixAccount.inc:365 ../lib/modules/posixAccount.inc:465
 #: ../lib/modules/posixAccount.inc:507 ../lib/modules/posixAccount.inc:1425
-#: ../lib/modules/posixAccount.inc:1853 ../lib/modules/posixAccount.inc:1976
+#: ../lib/modules/posixAccount.inc:1851 ../lib/modules/posixAccount.inc:1974
 msgid "Gecos"
 msgstr "Gecos"
 
@@ -4940,16 +4968,16 @@ msgid "General information"
 msgstr "General information"
 
 #: ../templates/config/mainmanage.php:286
-#: ../templates/config/confmodules.php:170 ../templates/config/jobList.php:154
-#: ../templates/config/jobs.php:157 ../templates/config/confmain.php:211
-#: ../templates/config/moduleSettings.php:169
-#: ../templates/config/conftypes.php:188
-#: ../templates/selfService/adminMain.php:405
-#: ../templates/profedit/profilepage.php:220
+#: ../templates/config/confmodules.php:180 ../templates/config/jobList.php:154
+#: ../templates/config/jobs.php:157 ../templates/config/confmain.php:214
+#: ../templates/config/moduleSettings.php:174
+#: ../templates/config/conftypes.php:207
+#: ../templates/selfService/adminMain.php:421
+#: ../templates/profedit/profilepage.php:232
 msgid "General settings"
 msgstr "General settings"
 
-#: ../templates/lists/changePassword.php:317 ../help/help.inc:282
+#: ../templates/lists/changePassword.php:318 ../help/help.inc:294
 msgid "Generate random password"
 msgstr "Generate random password"
 
@@ -4958,17 +4986,17 @@ msgstr "Generate random password"
 msgid "Generic Error"
 msgstr "Generic Error"
 
-#: ../lib/modules/windowsGroup.inc:67
+#: ../lib/modules/windowsGroup.inc:70
 msgid "Global"
 msgstr "Global"
 
-#: ../templates/pdfedit/pdfmain.php:328
-#: ../templates/profedit/profilemain.php:295
+#: ../templates/pdfedit/pdfmain.php:378
+#: ../templates/profedit/profilemain.php:339
 msgid "Global templates"
 msgstr "Global templates"
 
-#: ../templates/schema/schema.php:128 ../templates/schema/schema.php:265
-#: ../templates/schema/schema.php:296 ../templates/schema/schema.php:321
+#: ../templates/schema/schema.php:129 ../templates/schema/schema.php:266
+#: ../templates/schema/schema.php:297 ../templates/schema/schema.php:322
 msgid "Go"
 msgstr "Go"
 
@@ -4989,21 +5017,21 @@ msgstr "Google reCAPTCHA"
 
 #: ../lib/types/ppolicyType.inc:82 ../lib/modules/ppolicy.inc:100
 #: ../lib/modules/ppolicy.inc:149 ../lib/modules/ppolicy.inc:170
-#: ../lib/modules/ppolicy.inc:219 ../lib/modules/ppolicy.inc:476
+#: ../lib/modules/ppolicy.inc:219 ../lib/modules/ppolicy.inc:474
 msgid "Grace authentication limit"
 msgstr "Grace authentication limit"
 
-#: ../lib/modules/quota.inc:125 ../lib/modules/quota.inc:403
+#: ../lib/modules/quota.inc:128 ../lib/modules/quota.inc:406
 msgid "Grace block period"
 msgstr "Grace block period"
 
-#: ../lib/modules/quota.inc:126
+#: ../lib/modules/quota.inc:129
 msgid ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 msgstr ""
 "Grace block period. Most filesystems use a fixed maximum value of 7 days."
 
-#: ../lib/modules/quota.inc:148
+#: ../lib/modules/quota.inc:151
 msgid ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
@@ -5011,18 +5039,18 @@ msgstr ""
 "Grace inode (files) period. Most filesystems use a fixed maximum value of 7 "
 "days."
 
-#: ../lib/modules/quota.inc:147 ../lib/modules/quota.inc:407
+#: ../lib/modules/quota.inc:150 ../lib/modules/quota.inc:410
 msgid "Grace inode period"
 msgstr "Grace inode period"
 
-#: ../templates/config/confmain.php:362
-#: ../templates/selfService/adminMain.php:660
-#: ../lib/modules/nisNetGroupHost.inc:98
-#: ../lib/modules/nisNetGroupHost.inc:217
-#: ../lib/modules/nisNetGroupHost.inc:261
-#: ../lib/modules/nisNetGroupUser.inc:178
-#: ../lib/modules/nisNetGroupUser.inc:435
-#: ../lib/modules/nisNetGroupUser.inc:479
+#: ../templates/config/confmain.php:365
+#: ../templates/selfService/adminMain.php:713
+#: ../lib/modules/nisNetGroupHost.inc:101
+#: ../lib/modules/nisNetGroupHost.inc:220
+#: ../lib/modules/nisNetGroupHost.inc:262
+#: ../lib/modules/nisNetGroupUser.inc:181
+#: ../lib/modules/nisNetGroupUser.inc:438
+#: ../lib/modules/nisNetGroupUser.inc:480
 msgid "Group"
 msgstr "Group"
 
@@ -5037,7 +5065,7 @@ msgid "Group count: %s"
 msgstr "Group count: %s"
 
 #: ../lib/types/group.inc:106 ../lib/modules/posixGroup.inc:467
-#: ../lib/modules/nisnetgroup.inc:120
+#: ../lib/modules/nisnetgroup.inc:123
 msgid "Group description"
 msgstr "Group description"
 
@@ -5058,11 +5086,11 @@ msgstr "Group member DNs"
 #: ../lib/types/group.inc:110 ../lib/modules/pykotaPrinter.inc:119
 #: ../lib/modules/pykotaPrinter.inc:123 ../lib/modules/pykotaPrinter.inc:186
 #: ../lib/modules/pykotaPrinter.inc:199 ../lib/modules/pykotaPrinter.inc:265
-#: ../lib/modules/pykotaPrinter.inc:610 ../lib/modules/posixGroup.inc:219
+#: ../lib/modules/pykotaPrinter.inc:608 ../lib/modules/posixGroup.inc:219
 #: ../lib/modules/posixGroup.inc:295 ../lib/modules/posixGroup.inc:419
 #: ../lib/modules/posixGroup.inc:446 ../lib/modules/posixGroup.inc:484
-#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:623
-#: ../lib/modules/posixGroup.inc:636 ../lib/modules/windowsGroup.inc:388
+#: ../lib/modules/posixGroup.inc:488 ../lib/modules/posixGroup.inc:621
+#: ../lib/modules/posixGroup.inc:634 ../lib/modules/windowsGroup.inc:391
 msgid "Group members"
 msgstr "Group members"
 
@@ -5078,24 +5106,24 @@ msgstr "Group members (incl. primary members)"
 #: ../lib/modules/zarafaDynamicGroup.inc:195
 #: ../lib/modules/zarafaDynamicGroup.inc:196
 #: ../lib/modules/zarafaDynamicGroup.inc:220
-#: ../lib/modules/zarafaDynamicGroup.inc:433 ../lib/modules/posixGroup.inc:178
+#: ../lib/modules/zarafaDynamicGroup.inc:431 ../lib/modules/posixGroup.inc:178
 #: ../lib/modules/posixGroup.inc:423 ../lib/modules/posixGroup.inc:455
-#: ../lib/modules/posixGroup.inc:504 ../lib/modules/posixGroup.inc:624
-#: ../lib/modules/posixGroup.inc:667 ../lib/modules/posixGroup.inc:668
-#: ../lib/modules/posixGroup.inc:669 ../lib/modules/pykotaGroup.inc:197
+#: ../lib/modules/posixGroup.inc:504 ../lib/modules/posixGroup.inc:622
+#: ../lib/modules/posixGroup.inc:665 ../lib/modules/posixGroup.inc:666
+#: ../lib/modules/posixGroup.inc:667 ../lib/modules/pykotaGroup.inc:197
 #: ../lib/modules/pykotaGroup.inc:199 ../lib/modules/pykotaGroup.inc:218
-#: ../lib/modules/nisnetgroup.inc:83 ../lib/modules/nisnetgroup.inc:112
-#: ../lib/modules/nisnetgroup.inc:139 ../lib/modules/nisnetgroup.inc:151
-#: ../lib/modules/nisnetgroup.inc:193 ../lib/modules/nisnetgroup.inc:579
-#: ../lib/modules/organizationalRole.inc:85
-#: ../lib/modules/organizationalRole.inc:114
-#: ../lib/modules/organizationalRole.inc:137
-#: ../lib/modules/organizationalRole.inc:505
-#: ../lib/modules/windowsGroup.inc:116 ../lib/modules/windowsGroup.inc:182
-#: ../lib/modules/windowsGroup.inc:263 ../lib/modules/windowsGroup.inc:290
-#: ../lib/modules/windowsGroup.inc:307 ../lib/modules/windowsGroup.inc:911
-#: ../lib/modules/groupOfNames.inc:85 ../lib/modules/groupOfNames.inc:126
-#: ../lib/modules/groupOfNames.inc:167 ../lib/modules/groupOfNames.inc:748
+#: ../lib/modules/nisnetgroup.inc:86 ../lib/modules/nisnetgroup.inc:115
+#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/nisnetgroup.inc:196 ../lib/modules/nisnetgroup.inc:580
+#: ../lib/modules/organizationalRole.inc:88
+#: ../lib/modules/organizationalRole.inc:117
+#: ../lib/modules/organizationalRole.inc:140
+#: ../lib/modules/organizationalRole.inc:506
+#: ../lib/modules/windowsGroup.inc:119 ../lib/modules/windowsGroup.inc:185
+#: ../lib/modules/windowsGroup.inc:266 ../lib/modules/windowsGroup.inc:293
+#: ../lib/modules/windowsGroup.inc:310 ../lib/modules/windowsGroup.inc:912
+#: ../lib/modules/groupOfNames.inc:88 ../lib/modules/groupOfNames.inc:129
+#: ../lib/modules/groupOfNames.inc:170 ../lib/modules/groupOfNames.inc:749
 msgid "Group name"
 msgstr "Group name"
 
@@ -5109,11 +5137,11 @@ msgid "Group name already in use."
 msgstr "Group name already in use."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:196
-#: ../lib/modules/zarafaDynamicGroup.inc:197 ../lib/modules/posixGroup.inc:669
-#: ../lib/modules/posixGroup.inc:670 ../lib/modules/pykotaGroup.inc:197
+#: ../lib/modules/zarafaDynamicGroup.inc:197 ../lib/modules/posixGroup.inc:667
+#: ../lib/modules/posixGroup.inc:668 ../lib/modules/pykotaGroup.inc:197
 #: ../lib/modules/pykotaGroup.inc:198 ../lib/modules/pykotaGroup.inc:201
-#: ../lib/modules/pykotaGroup.inc:202 ../lib/modules/nisnetgroup.inc:151
-#: ../lib/modules/windowsGroup.inc:290 ../lib/modules/windowsGroup.inc:291
+#: ../lib/modules/pykotaGroup.inc:202 ../lib/modules/nisnetgroup.inc:154
+#: ../lib/modules/windowsGroup.inc:293 ../lib/modules/windowsGroup.inc:294
 msgid ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -5121,11 +5149,11 @@ msgstr ""
 "Group name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 
-#: ../lib/modules/windowsGroup.inc:157
+#: ../lib/modules/windowsGroup.inc:160
 msgid "Group name for NIS."
 msgstr "Group name for NIS."
 
-#: ../lib/modules/posixGroup.inc:668
+#: ../lib/modules/posixGroup.inc:666
 msgid "Group name in use. Selected next free group name."
 msgstr "Group name in use. Selected next free group name."
 
@@ -5154,7 +5182,7 @@ msgstr "Group name that is used for PyKota."
 #: ../lib/modules/freeRadius.inc:100 ../lib/modules/freeRadius.inc:104
 #: ../lib/modules/freeRadius.inc:150 ../lib/modules/freeRadius.inc:198
 #: ../lib/modules/freeRadius.inc:264 ../lib/modules/freeRadius.inc:312
-#: ../lib/modules/freeRadius.inc:359 ../lib/modules/freeRadius.inc:698
+#: ../lib/modules/freeRadius.inc:359 ../lib/modules/freeRadius.inc:696
 msgid "Group names"
 msgstr "Group names"
 
@@ -5162,7 +5190,7 @@ msgstr "Group names"
 msgid "Group of members"
 msgstr "Group of members"
 
-#: ../lib/modules/groupOfNames.inc:65
+#: ../lib/modules/groupOfNames.inc:68
 msgid "Group of names"
 msgstr "Group of names"
 
@@ -5178,40 +5206,40 @@ msgstr "Group of unique names"
 msgid "Group password"
 msgstr "Group password"
 
-#: ../lib/modules/windowsGroup.inc:148 ../lib/modules/windowsGroup.inc:201
-#: ../lib/modules/windowsGroup.inc:269 ../lib/modules/windowsGroup.inc:345
-#: ../lib/modules/windowsGroup.inc:941
+#: ../lib/modules/windowsGroup.inc:151 ../lib/modules/windowsGroup.inc:204
+#: ../lib/modules/windowsGroup.inc:272 ../lib/modules/windowsGroup.inc:348
+#: ../lib/modules/windowsGroup.inc:942
 msgid "Group scope"
 msgstr "Group scope"
 
 #: ../lib/modules/sambaGroupMapping.inc:382
-#: ../lib/modules/windowsGroup.inc:144 ../lib/modules/windowsGroup.inc:209
-#: ../lib/modules/windowsGroup.inc:268 ../lib/modules/windowsGroup.inc:348
-#: ../lib/modules/windowsGroup.inc:942
+#: ../lib/modules/windowsGroup.inc:147 ../lib/modules/windowsGroup.inc:212
+#: ../lib/modules/windowsGroup.inc:271 ../lib/modules/windowsGroup.inc:351
+#: ../lib/modules/windowsGroup.inc:943
 msgid "Group type"
 msgstr "Group type"
 
 #: ../lib/types/group.inc:67 ../lib/modules/posixGroup.inc:565
-#: ../lib/modules/zarafaGroup.inc:746 ../lib/modules/windowsUser.inc:233
+#: ../lib/modules/zarafaGroup.inc:744 ../lib/modules/windowsUser.inc:233
 #: ../lib/modules/windowsUser.inc:236 ../lib/modules/windowsUser.inc:582
 #: ../lib/modules/windowsUser.inc:840 ../lib/modules/windowsUser.inc:1276
-#: ../lib/modules/windowsUser.inc:1683 ../lib/modules/windowsUser.inc:2492
-#: ../lib/modules/windowsUser.inc:2524
+#: ../lib/modules/windowsUser.inc:1683 ../lib/modules/windowsUser.inc:2490
+#: ../lib/modules/windowsUser.inc:2522
 #: ../lib/modules/generalInformation.inc:112
-#: ../lib/modules/windowsGroup.inc:520
+#: ../lib/modules/windowsGroup.inc:523
 msgid "Groups"
 msgstr "Groups"
 
 #: ../lib/types/gon.inc:66 ../lib/modules/posixAccount.inc:305
 #: ../lib/modules/posixAccount.inc:368 ../lib/modules/posixAccount.inc:1591
-#: ../lib/modules/posixAccount.inc:1740 ../lib/modules/posixAccount.inc:1863
-#: ../lib/modules/posixAccount.inc:1981 ../lib/modules/groupOfNamesUser.inc:54
+#: ../lib/modules/posixAccount.inc:1740 ../lib/modules/posixAccount.inc:1861
+#: ../lib/modules/posixAccount.inc:1979 ../lib/modules/groupOfNamesUser.inc:54
 #: ../lib/modules/groupOfNamesUser.inc:56
 #: ../lib/modules/groupOfNamesUser.inc:60
 #: ../lib/modules/groupOfNamesUser.inc:64
 #: ../lib/modules/groupOfNamesUser.inc:71
 #: ../lib/modules/groupOfNamesUser.inc:334
-#: ../lib/modules/groupOfNamesUser.inc:373
+#: ../lib/modules/groupOfNamesUser.inc:371
 msgid "Groups of names"
 msgstr "Groups of names"
 
@@ -5219,44 +5247,44 @@ msgstr "Groups of names"
 msgid "H-Node (0x08)"
 msgstr "H-Node (0x08)"
 
-#: ../templates/config/confmain.php:433 ../lib/passwordExpirationJob.inc:86
+#: ../templates/config/confmain.php:436 ../lib/passwordExpirationJob.inc:86
 #: ../lib/modules/selfRegistration.inc:241
-#: ../lib/modules/passwordSelfReset.inc:683
-#: ../lib/modules/passwordSelfReset.inc:703 ../help/help.inc:293
+#: ../lib/modules/passwordSelfReset.inc:681
+#: ../lib/modules/passwordSelfReset.inc:701 ../help/help.inc:305
 msgid "HTML format"
 msgstr "HTML format"
 
-#: ../templates/config/confmain.php:525
-#: ../templates/selfService/adminMain.php:449 ../help/help.inc:128
+#: ../templates/config/confmain.php:528
+#: ../templates/selfService/adminMain.php:465 ../help/help.inc:128
 msgid "HTTP authentication"
 msgstr "HTTP authentication"
 
 #: ../lib/modules/zarafaServer.inc:68 ../lib/modules/zarafaServer.inc:100
 #: ../lib/modules/zarafaServer.inc:135 ../lib/modules/zarafaServer.inc:173
-#: ../lib/modules/zarafaServer.inc:195 ../lib/modules/zarafaServer.inc:357
+#: ../lib/modules/zarafaServer.inc:195 ../lib/modules/zarafaServer.inc:355
 msgid "HTTP port"
 msgstr "HTTP port"
 
-#: ../lib/modules/quota.inc:635 ../lib/modules/systemQuotas.inc:388
+#: ../lib/modules/quota.inc:636 ../lib/modules/systemQuotas.inc:389
 msgid "Hard block"
 msgstr "Hard block"
 
-#: ../lib/modules/quota.inc:119 ../lib/modules/quota.inc:120
-#: ../lib/modules/quota.inc:402 ../lib/modules/quota.inc:508
-#: ../lib/modules/systemQuotas.inc:126
+#: ../lib/modules/quota.inc:122 ../lib/modules/quota.inc:123
+#: ../lib/modules/quota.inc:405 ../lib/modules/quota.inc:511
+#: ../lib/modules/systemQuotas.inc:129
 msgid "Hard block limit"
 msgstr "Hard block limit"
 
-#: ../lib/modules/quota.inc:637 ../lib/modules/systemQuotas.inc:390
+#: ../lib/modules/quota.inc:638 ../lib/modules/systemQuotas.inc:391
 msgid "Hard inode"
 msgstr "Hard inode"
 
-#: ../lib/modules/quota.inc:142
+#: ../lib/modules/quota.inc:145
 msgid "Hard inode (files) limit"
 msgstr "Hard inode (files) limit"
 
-#: ../lib/modules/quota.inc:141 ../lib/modules/quota.inc:406
-#: ../lib/modules/quota.inc:510 ../lib/modules/systemQuotas.inc:130
+#: ../lib/modules/quota.inc:144 ../lib/modules/quota.inc:409
+#: ../lib/modules/quota.inc:513 ../lib/modules/systemQuotas.inc:133
 msgid "Hard inode limit"
 msgstr "Hard inode limit"
 
@@ -5267,12 +5295,12 @@ msgstr "Has subentries"
 #: ../lib/modules/selfRegistration.inc:106
 #: ../lib/modules/selfRegistration.inc:229
 #: ../lib/modules/passwordSelfReset.inc:160
-#: ../lib/modules/passwordSelfReset.inc:709
+#: ../lib/modules/passwordSelfReset.inc:707
 msgid "Header"
 msgstr "Header"
 
-#: ../templates/pdfedit/pdfpage.php:456 ../templates/pdfedit/pdfpage.php:595
-#: ../templates/pdfedit/pdfpage.php:602
+#: ../templates/pdfedit/pdfpage.php:471 ../templates/pdfedit/pdfpage.php:611
+#: ../templates/pdfedit/pdfpage.php:618
 msgid "Headline"
 msgstr "Headline"
 
@@ -5280,15 +5308,15 @@ msgstr "Headline"
 msgid "Heimdal Kerberos password change command"
 msgstr "Heimdal Kerberos password change command"
 
-#: ../templates/main_header.php:140 ../lib/modules.inc:676
+#: ../templates/main_header.php:138 ../lib/modules.inc:689
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/modules/customFields.inc:96 ../lib/modules/customFields.inc:1740
+#: ../lib/modules/customFields.inc:96 ../lib/modules/customFields.inc:1738
 msgid "Help text"
 msgstr "Help text"
 
-#: ../lib/tools/schemaBrowser.inc:53
+#: ../lib/tools/schemaBrowser.inc:54
 msgid "Here you can browse LDAP object classes and attributes."
 msgstr "Here you can browse LDAP object classes and attributes."
 
@@ -5296,11 +5324,11 @@ msgstr "Here you can browse LDAP object classes and attributes."
 msgid "Here you can change the settings for the terminal server access."
 msgstr "Here you can change the settings for the terminal server access."
 
-#: ../lib/selfService.inc:400
+#: ../lib/selfService.inc:410
 msgid "Here you can change your personal settings."
 msgstr "Here you can change your personal settings."
 
-#: ../templates/masscreate.php:129
+#: ../templates/upload/masscreate.php:154
 msgid "Here you can create multiple accounts by providing a CSV file."
 msgstr "Here you can create multiple accounts by providing a CSV file."
 
@@ -5308,8 +5336,8 @@ msgstr "Here you can create multiple accounts by providing a CSV file."
 msgid "Here you can enter a description for this DHCP entry."
 msgstr "Here you can enter a description for this DHCP entry."
 
-#: ../lib/modules/nisnetgroup.inc:88 ../lib/modules/organizationalRole.inc:90
-#: ../lib/modules/groupOfNames.inc:90
+#: ../lib/modules/nisnetgroup.inc:91 ../lib/modules/organizationalRole.inc:93
+#: ../lib/modules/groupOfNames.inc:93
 msgid "Here you can enter a description for this group."
 msgstr "Here you can enter a description for this group."
 
@@ -5318,10 +5346,10 @@ msgid "Here you can enter a description for this role."
 msgstr "Here you can enter a description for this role."
 
 #: ../lib/modules/pykotaPrinter.inc:129 ../lib/modules/zarafaContact.inc:98
-#: ../lib/modules/posixGroup.inc:530 ../lib/modules/zarafaUser.inc:155
-#: ../lib/modules/sambaGroupMapping.inc:171 ../lib/modules/nisnetgroup.inc:105
-#: ../lib/modules/organizationalRole.inc:102
-#: ../lib/modules/groupOfNames.inc:114 ../lib/modules/nisMailAlias.inc:94
+#: ../lib/modules/posixGroup.inc:530 ../lib/modules/zarafaUser.inc:158
+#: ../lib/modules/sambaGroupMapping.inc:171 ../lib/modules/nisnetgroup.inc:108
+#: ../lib/modules/organizationalRole.inc:105
+#: ../lib/modules/groupOfNames.inc:117 ../lib/modules/nisMailAlias.inc:94
 msgid ""
 "Here you can enter a filter value. Only entries which contain the filter "
 "text will be shown."
@@ -5337,7 +5365,7 @@ msgstr ""
 "Here you can enter a list of additional group memberships. The group names "
 "are separated by commas."
 
-#: ../lib/modules/nisNetGroupUser.inc:77
+#: ../lib/modules/nisNetGroupUser.inc:80
 msgid ""
 "Here you can enter a list of net groups. Group blocks are separated by comma "
 "in format GROUP#HOST#DOMAIN. Host and domain are optional."
@@ -5351,7 +5379,7 @@ msgid ""
 msgstr ""
 "Here you can enter a list of roles. The role names are separated by commas."
 
-#: ../lib/modules/device.inc:66
+#: ../lib/modules/device.inc:69
 msgid "Here you can enter a serial number for this device."
 msgstr "Here you can enter a serial number for this device."
 
@@ -5378,11 +5406,11 @@ msgstr ""
 "classes."
 
 #: ../lib/modules/windowsUser.inc:323 ../lib/modules/windowsUser.inc:327
-#: ../lib/modules/inetOrgPerson.inc:828 ../lib/modules/inetOrgPerson.inc:832
+#: ../lib/modules/inetOrgPerson.inc:826 ../lib/modules/inetOrgPerson.inc:830
 msgid "Here you can enter the user's department."
 msgstr "Here you can enter the user's department."
 
-#: ../lib/modules/zarafaUser.inc:170
+#: ../lib/modules/zarafaUser.inc:173
 msgid "Here you can explicitly enable and disable Zarafa features."
 msgstr "Here you can explicitly enable and disable Zarafa features."
 
@@ -5442,7 +5470,7 @@ msgstr ""
 "Here you can load an account profile to set default settings for your "
 "account. The \"default\" profile is automatically loaded for new accounts."
 
-#: ../lib/tools/profileEditor.inc:53
+#: ../lib/tools/profileEditor.inc:54
 msgid "Here you can manage your account profiles."
 msgstr "Here you can manage your account profiles."
 
@@ -5512,7 +5540,7 @@ msgstr ""
 "Here you can specify minimum requirements for passwords. The character "
 "classes are: lowercase, uppercase, numeric and symbols."
 
-#: ../lib/modules/nisnetgroup.inc:92
+#: ../lib/modules/nisnetgroup.inc:95
 msgid ""
 "Here you can specify subgroups which are included in this NIS netgroup. All "
 "members of the subgroups will be treated as members of this group."
@@ -5546,7 +5574,7 @@ msgid ""
 msgstr ""
 "Here you can specify the minimum number of characters for a user password."
 
-#: ../templates/lists/changePassword.php:365
+#: ../templates/lists/changePassword.php:366
 msgid "Here you can specify the new password yourself."
 msgstr "Here you can specify the new password yourself."
 
@@ -5554,7 +5582,7 @@ msgstr "Here you can specify the new password yourself."
 msgid "Here you can specify the shadowing mode."
 msgstr "Here you can specify the shadowing mode."
 
-#: ../lib/tools/tests.inc:53
+#: ../lib/tools/tests.inc:54
 msgid "Here you can test if certain LAM features work on your installation."
 msgstr "Here you can test if certain LAM features work on your installation."
 
@@ -5562,27 +5590,27 @@ msgstr "Here you can test if certain LAM features work on your installation."
 msgid "Here you can upload a new file."
 msgstr "Here you can upload a new file."
 
-#: ../templates/config/conftypes.php:311
+#: ../templates/config/conftypes.php:348
 #: ../lib/types/zarafaAddressListType.inc:95
 #: ../lib/types/zarafaDynamicGroupType.inc:96
 #: ../lib/modules/zarafaDynamicGroup.inc:79
 #: ../lib/modules/zarafaDynamicGroup.inc:136
 #: ../lib/modules/zarafaDynamicGroup.inc:169
 #: ../lib/modules/zarafaDynamicGroup.inc:273
-#: ../lib/modules/zarafaDynamicGroup.inc:447
+#: ../lib/modules/zarafaDynamicGroup.inc:445
 #: ../lib/modules/zarafaContact.inc:77 ../lib/modules/zarafaContact.inc:181
 #: ../lib/modules/zarafaContact.inc:189 ../lib/modules/zarafaContact.inc:274
-#: ../lib/modules/zarafaContact.inc:624 ../lib/modules/zarafaGroup.inc:90
+#: ../lib/modules/zarafaContact.inc:622 ../lib/modules/zarafaGroup.inc:90
 #: ../lib/modules/zarafaGroup.inc:129 ../lib/modules/zarafaGroup.inc:179
-#: ../lib/modules/zarafaGroup.inc:284 ../lib/modules/zarafaGroup.inc:644
+#: ../lib/modules/zarafaGroup.inc:284 ../lib/modules/zarafaGroup.inc:642
 #: ../lib/modules/zarafaAddressList.inc:67
 #: ../lib/modules/zarafaAddressList.inc:112
 #: ../lib/modules/zarafaAddressList.inc:143
 #: ../lib/modules/zarafaAddressList.inc:214
-#: ../lib/modules/zarafaAddressList.inc:346 ../lib/modules/zarafaUser.inc:94
-#: ../lib/modules/zarafaUser.inc:310 ../lib/modules/zarafaUser.inc:359
-#: ../lib/modules/zarafaUser.inc:386 ../lib/modules/zarafaUser.inc:606
-#: ../lib/modules/zarafaUser.inc:1312 ../help/help.inc:176
+#: ../lib/modules/zarafaAddressList.inc:344 ../lib/modules/zarafaUser.inc:97
+#: ../lib/modules/zarafaUser.inc:313 ../lib/modules/zarafaUser.inc:362
+#: ../lib/modules/zarafaUser.inc:389 ../lib/modules/zarafaUser.inc:609
+#: ../lib/modules/zarafaUser.inc:1313 ../help/help.inc:176
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -5595,28 +5623,28 @@ msgstr ""
 "display e.g. only groups but still need to manage their members."
 
 #: ../lib/modules/nisMailAliasUser.inc:104
-#: ../lib/modules/nisMailAliasUser.inc:564
+#: ../lib/modules/nisMailAliasUser.inc:571
 #: ../lib/modules/asteriskAccount.inc:243
-#: ../lib/modules/asteriskAccount.inc:1240 ../lib/modules/qmailUser.inc:102
+#: ../lib/modules/asteriskAccount.inc:1238 ../lib/modules/qmailUser.inc:102
 #: ../lib/modules/qmailUser.inc:195 ../lib/modules/zarafaGroup.inc:113
-#: ../lib/modules/zarafaGroup.inc:773 ../lib/modules/sambaSamAccount.inc:400
+#: ../lib/modules/zarafaGroup.inc:771 ../lib/modules/sambaSamAccount.inc:400
 #: ../lib/modules/sambaSamAccount.inc:1881 ../lib/modules/posixAccount.inc:382
-#: ../lib/modules/posixAccount.inc:1972 ../lib/modules/zarafaUser.inc:146
-#: ../lib/modules/zarafaUser.inc:1820 ../lib/modules/windowsUser.inc:251
-#: ../lib/modules/windowsUser.inc:3205 ../lib/modules/inetOrgPerson.inc:835
-#: ../lib/modules/inetOrgPerson.inc:3638 ../lib/modules/freeRadius.inc:128
+#: ../lib/modules/posixAccount.inc:1970 ../lib/modules/zarafaUser.inc:149
+#: ../lib/modules/zarafaUser.inc:1821 ../lib/modules/windowsUser.inc:251
+#: ../lib/modules/windowsUser.inc:3203 ../lib/modules/inetOrgPerson.inc:833
+#: ../lib/modules/inetOrgPerson.inc:3618 ../lib/modules/freeRadius.inc:128
 #: ../lib/modules/freeRadius.inc:301 ../lib/modules/zarafaServer.inc:88
 #: ../lib/modules/zarafaServer.inc:159 ../lib/modules/qmailGroup.inc:68
-#: ../lib/modules/qmailGroup.inc:119 ../lib/modules/organizationalRole.inc:81
-#: ../lib/modules/organizationalRole.inc:159
+#: ../lib/modules/qmailGroup.inc:119 ../lib/modules/organizationalRole.inc:84
+#: ../lib/modules/organizationalRole.inc:162
 #: ../lib/modules/passwordSelfReset.inc:164
 #: ../lib/modules/passwordSelfReset.inc:302
-#: ../lib/modules/windowsGroup.inc:112 ../lib/modules/windowsGroup.inc:167
-#: ../lib/modules/groupOfNames.inc:81 ../lib/modules/groupOfNames.inc:195
+#: ../lib/modules/windowsGroup.inc:115 ../lib/modules/windowsGroup.inc:170
+#: ../lib/modules/groupOfNames.inc:84 ../lib/modules/groupOfNames.inc:198
 msgid "Hidden options"
 msgstr "Hidden options"
 
-#: ../templates/config/confmain.php:452
+#: ../templates/config/confmain.php:455
 msgid "Hidden tools"
 msgstr "Hidden tools"
 
@@ -5645,7 +5673,7 @@ msgstr "Hide/Unhide the tree"
 msgid "Hint"
 msgstr "Hint"
 
-#: ../templates/masscreate.php:249
+#: ../templates/upload/masscreate.php:275
 msgid ""
 "Hint: Format all cells as text in your spreadsheet program and turn off auto "
 "correction."
@@ -5677,17 +5705,17 @@ msgstr "Hold the CTRL-key to (de)select multiple roles."
 #: ../lib/types/user.inc:99 ../lib/modules/sambaSamAccount.inc:231
 #: ../lib/modules/sambaSamAccount.inc:355
 #: ../lib/modules/sambaSamAccount.inc:1447
-#: ../lib/modules/sambaSamAccount.inc:1931 ../lib/modules/posixAccount.inc:100
+#: ../lib/modules/sambaSamAccount.inc:1929 ../lib/modules/posixAccount.inc:100
 #: ../lib/modules/posixAccount.inc:101 ../lib/modules/posixAccount.inc:103
 #: ../lib/modules/posixAccount.inc:251 ../lib/modules/posixAccount.inc:357
 #: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:419
 #: ../lib/modules/posixAccount.inc:423 ../lib/modules/posixAccount.inc:473
 #: ../lib/modules/posixAccount.inc:1444 ../lib/modules/posixAccount.inc:1647
-#: ../lib/modules/posixAccount.inc:1747 ../lib/modules/posixAccount.inc:1851
+#: ../lib/modules/posixAccount.inc:1747 ../lib/modules/posixAccount.inc:1849
 #: ../lib/modules/windowsUser.inc:262 ../lib/modules/windowsUser.inc:576
 #: ../lib/modules/windowsUser.inc:747 ../lib/modules/windowsUser.inc:843
 #: ../lib/modules/windowsUser.inc:989 ../lib/modules/windowsUser.inc:1232
-#: ../lib/modules/windowsUser.inc:2486
+#: ../lib/modules/windowsUser.inc:2484
 msgid "Home directory"
 msgstr "Home directory"
 
@@ -5708,10 +5736,10 @@ msgstr ""
 #: ../lib/modules/sambaSamAccount.inc:1455
 #: ../lib/modules/sambaSamAccount.inc:1698
 #: ../lib/modules/sambaSamAccount.inc:1886
-#: ../lib/modules/sambaSamAccount.inc:1916
-#: ../lib/modules/sambaSamAccount.inc:1932 ../lib/modules/windowsUser.inc:259
+#: ../lib/modules/sambaSamAccount.inc:1914
+#: ../lib/modules/sambaSamAccount.inc:1930 ../lib/modules/windowsUser.inc:259
 #: ../lib/modules/windowsUser.inc:570 ../lib/modules/windowsUser.inc:842
-#: ../lib/modules/windowsUser.inc:1230 ../lib/modules/windowsUser.inc:2487
+#: ../lib/modules/windowsUser.inc:1230 ../lib/modules/windowsUser.inc:2485
 msgid "Home drive"
 msgstr "Home drive"
 
@@ -5722,7 +5750,7 @@ msgstr "Home drive"
 #: ../lib/modules/sambaSamAccount.inc:1163
 #: ../lib/modules/sambaSamAccount.inc:1702
 #: ../lib/modules/sambaSamAccount.inc:1888
-#: ../lib/modules/sambaSamAccount.inc:1915
+#: ../lib/modules/sambaSamAccount.inc:1913
 msgid "Home path"
 msgstr "Home path"
 
@@ -5730,16 +5758,16 @@ msgstr "Home path"
 msgid "Home path is invalid."
 msgstr "Home path is invalid."
 
-#: ../lib/modules/zarafaUser.inc:143
+#: ../lib/modules/zarafaUser.inc:146
 msgid "Home server for the user."
 msgstr "Home server for the user."
 
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:163
-#: ../lib/modules/inetOrgPerson.inc:434 ../lib/modules/inetOrgPerson.inc:592
-#: ../lib/modules/inetOrgPerson.inc:779 ../lib/modules/inetOrgPerson.inc:783
-#: ../lib/modules/inetOrgPerson.inc:1471 ../lib/modules/inetOrgPerson.inc:1474
-#: ../lib/modules/inetOrgPerson.inc:1993 ../lib/modules/inetOrgPerson.inc:2558
-#: ../lib/modules/inetOrgPerson.inc:3664 ../lib/modules/inetOrgPerson.inc:3720
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:161
+#: ../lib/modules/inetOrgPerson.inc:432 ../lib/modules/inetOrgPerson.inc:590
+#: ../lib/modules/inetOrgPerson.inc:777 ../lib/modules/inetOrgPerson.inc:781
+#: ../lib/modules/inetOrgPerson.inc:1469 ../lib/modules/inetOrgPerson.inc:1472
+#: ../lib/modules/inetOrgPerson.inc:1989 ../lib/modules/inetOrgPerson.inc:2554
+#: ../lib/modules/inetOrgPerson.inc:3644 ../lib/modules/inetOrgPerson.inc:3700
 msgid "Home telephone number"
 msgstr "Home telephone number"
 
@@ -5753,8 +5781,8 @@ msgstr "Homedirectory contains invalid characters."
 #: ../lib/modules/asteriskAccount.inc:268
 #: ../lib/modules/asteriskAccount.inc:318
 #: ../lib/modules/asteriskAccount.inc:591
-#: ../lib/modules/asteriskAccount.inc:987 ../lib/modules/nisnetgroup.inc:217
-#: ../lib/modules/nisnetgroup.inc:585 ../lib/modules/fixed_ip.inc:580
+#: ../lib/modules/asteriskAccount.inc:985 ../lib/modules/nisnetgroup.inc:220
+#: ../lib/modules/nisnetgroup.inc:586 ../lib/modules/fixed_ip.inc:583
 #: ../lib/modules/hostObject.inc:145
 msgid "Host"
 msgstr "Host"
@@ -5778,7 +5806,7 @@ msgid "Host description. If left empty host name will be used."
 msgstr "Host description. If left empty host name will be used."
 
 #: ../lib/modules/hostObject.inc:91 ../lib/modules/hostObject.inc:98
-#: ../lib/modules/hostObject.inc:205
+#: ../lib/modules/hostObject.inc:203
 msgid "Host list"
 msgstr "Host list"
 
@@ -5786,22 +5814,22 @@ msgstr "Host list"
 #: ../lib/modules/account.inc:91 ../lib/modules/account.inc:212
 #: ../lib/modules/windowsHost.inc:74 ../lib/modules/windowsHost.inc:94
 #: ../lib/modules/windowsHost.inc:119 ../lib/modules/windowsHost.inc:131
-#: ../lib/modules/windowsHost.inc:142 ../lib/modules/windowsHost.inc:291
+#: ../lib/modules/windowsHost.inc:142 ../lib/modules/windowsHost.inc:289
 #: ../lib/modules/posixAccount.inc:115 ../lib/modules/posixAccount.inc:116
 #: ../lib/modules/posixAccount.inc:118 ../lib/modules/posixAccount.inc:316
 #: ../lib/modules/posixAccount.inc:347 ../lib/modules/posixAccount.inc:503
-#: ../lib/modules/posixAccount.inc:1407 ../lib/modules/posixAccount.inc:1837
-#: ../lib/modules/bindDLZ.inc:88 ../lib/modules/bindDLZ.inc:147
-#: ../lib/modules/bindDLZ.inc:151 ../lib/modules/bindDLZ.inc:247
-#: ../lib/modules/bindDLZ.inc:301 ../lib/modules/bindDLZ.inc:417
-#: ../lib/modules/bindDLZ.inc:477 ../lib/modules/bindDLZ.inc:504
-#: ../lib/modules/bindDLZ.inc:549 ../lib/modules/bindDLZ.inc:553
-#: ../lib/modules/bindDLZ.inc:757 ../lib/modules/bindDLZ.inc:1474
-#: ../lib/modules/bindDLZ.inc:1498 ../lib/modules/nisNetGroupUser.inc:94
-#: ../lib/modules/nisNetGroupUser.inc:179
-#: ../lib/modules/nisNetGroupUser.inc:436
-#: ../lib/modules/nisNetGroupUser.inc:480 ../lib/modules/nisnetgroup.inc:153
-#: ../lib/modules/nisnetgroup.inc:481
+#: ../lib/modules/posixAccount.inc:1407 ../lib/modules/posixAccount.inc:1835
+#: ../lib/modules/bindDLZ.inc:91 ../lib/modules/bindDLZ.inc:150
+#: ../lib/modules/bindDLZ.inc:154 ../lib/modules/bindDLZ.inc:250
+#: ../lib/modules/bindDLZ.inc:304 ../lib/modules/bindDLZ.inc:420
+#: ../lib/modules/bindDLZ.inc:480 ../lib/modules/bindDLZ.inc:507
+#: ../lib/modules/bindDLZ.inc:552 ../lib/modules/bindDLZ.inc:556
+#: ../lib/modules/bindDLZ.inc:760 ../lib/modules/bindDLZ.inc:1475
+#: ../lib/modules/bindDLZ.inc:1499 ../lib/modules/nisNetGroupUser.inc:97
+#: ../lib/modules/nisNetGroupUser.inc:182
+#: ../lib/modules/nisNetGroupUser.inc:439
+#: ../lib/modules/nisNetGroupUser.inc:481 ../lib/modules/nisnetgroup.inc:156
+#: ../lib/modules/nisnetgroup.inc:484
 msgid "Host name"
 msgstr "Host name"
 
@@ -5811,7 +5839,7 @@ msgstr "Host name already exists!"
 
 #: ../lib/modules/windowsHost.inc:131 ../lib/modules/windowsHost.inc:132
 #: ../lib/modules/posixAccount.inc:116 ../lib/modules/posixAccount.inc:120
-#: ../lib/modules/nisNetGroupUser.inc:94 ../lib/modules/nisnetgroup.inc:153
+#: ../lib/modules/nisNetGroupUser.inc:97 ../lib/modules/nisnetgroup.inc:156
 msgid ""
 "Host name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -5841,11 +5869,11 @@ msgstr ""
 
 #: ../lib/types/host.inc:53 ../lib/modules/posixAccount.inc:95
 #: ../lib/modules/posixAccount.inc:96 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:1929 ../lib/modules/sudoRole.inc:78
+#: ../lib/modules/posixAccount.inc:1927 ../lib/modules/sudoRole.inc:78
 #: ../lib/modules/sudoRole.inc:103 ../lib/modules/sudoRole.inc:165
 #: ../lib/modules/sudoRole.inc:217 ../lib/modules/sudoRole.inc:229
-#: ../lib/modules/sudoRole.inc:343 ../lib/modules/sudoRole.inc:756
-#: ../lib/modules/fixed_ip.inc:80 ../lib/modules/hostObject.inc:69
+#: ../lib/modules/sudoRole.inc:343 ../lib/modules/sudoRole.inc:754
+#: ../lib/modules/fixed_ip.inc:83 ../lib/modules/hostObject.inc:69
 #: ../lib/modules/hostObject.inc:79
 msgid "Hosts"
 msgstr "Hosts"
@@ -5854,21 +5882,21 @@ msgstr "Hosts"
 msgid "I am out of office."
 msgstr "I am out of office."
 
-#: ../lib/modules/zarafaContact.inc:212 ../lib/modules/posixGroup.inc:662
+#: ../lib/modules/zarafaContact.inc:212 ../lib/modules/posixGroup.inc:660
 #: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:1139
 msgid "ID is already in use"
 msgstr "ID is already in use"
 
-#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixGroup.inc:661
-#: ../lib/modules/posixGroup.inc:662 ../lib/modules/posixGroup.inc:786
+#: ../lib/modules/posixGroup.inc:658 ../lib/modules/posixGroup.inc:659
+#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixGroup.inc:784
 #: ../lib/modules/posixAccount.inc:104 ../lib/modules/posixAccount.inc:105
 #: ../lib/modules/posixAccount.inc:106 ../lib/modules/posixAccount.inc:1130
 #: ../lib/modules/posixAccount.inc:1135 ../lib/modules/posixAccount.inc:1139
 msgid "ID-Number"
 msgstr "ID-Number"
 
-#: ../lib/modules/zarafaUser.inc:319 ../lib/modules/zarafaUser.inc:673
-#: ../lib/modules/zarafaUser.inc:1372
+#: ../lib/modules/zarafaUser.inc:322 ../lib/modules/zarafaUser.inc:676
+#: ../lib/modules/zarafaUser.inc:1373
 msgid "IMAP"
 msgstr "IMAP"
 
@@ -5886,21 +5914,21 @@ msgstr "IMAP password input"
 #: ../lib/modules/asteriskAccount.inc:295
 #: ../lib/modules/asteriskAccount.inc:522
 #: ../lib/modules/asteriskAccount.inc:746
-#: ../lib/modules/asteriskAccount.inc:1014
-#: ../lib/modules/asteriskAccount.inc:1294 ../lib/modules/bindDLZ.inc:92
-#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:255
-#: ../lib/modules/bindDLZ.inc:495 ../lib/modules/bindDLZ.inc:652
-#: ../lib/modules/bindDLZ.inc:1479 ../lib/modules/freeRadius.inc:88
+#: ../lib/modules/asteriskAccount.inc:1012
+#: ../lib/modules/asteriskAccount.inc:1292 ../lib/modules/bindDLZ.inc:95
+#: ../lib/modules/bindDLZ.inc:99 ../lib/modules/bindDLZ.inc:258
+#: ../lib/modules/bindDLZ.inc:498 ../lib/modules/bindDLZ.inc:655
+#: ../lib/modules/bindDLZ.inc:1480 ../lib/modules/freeRadius.inc:88
 #: ../lib/modules/freeRadius.inc:206 ../lib/modules/freeRadius.inc:255
 #: ../lib/modules/freeRadius.inc:306 ../lib/modules/freeRadius.inc:363
-#: ../lib/modules/freeRadius.inc:695 ../lib/modules/fixed_ip.inc:106
-#: ../lib/modules/fixed_ip.inc:421 ../lib/modules/fixed_ip.inc:742
+#: ../lib/modules/freeRadius.inc:693 ../lib/modules/fixed_ip.inc:109
+#: ../lib/modules/fixed_ip.inc:424 ../lib/modules/fixed_ip.inc:743
 msgid "IP address"
 msgstr "IP address"
 
 #: ../lib/modules/ddns.inc:98 ../lib/modules/ddns.inc:112
 #: ../lib/modules/ddns.inc:121 ../lib/modules/ddns.inc:381
-#: ../lib/modules/ddns.inc:425
+#: ../lib/modules/ddns.inc:423
 msgid "IP address of the DNS server"
 msgstr "IP address of the DNS server"
 
@@ -5913,15 +5941,15 @@ msgid "IP address or domain name of the registration server."
 msgstr "IP address or domain name of the registration server."
 
 #: ../lib/modules/ipHost.inc:69 ../lib/modules/ipHost.inc:88
-#: ../lib/modules/ipHost.inc:110 ../lib/modules/ipHost.inc:303
+#: ../lib/modules/ipHost.inc:110 ../lib/modules/ipHost.inc:301
 msgid "IP addresses"
 msgstr "IP addresses"
 
-#: ../lib/modules/bindDLZ.inc:649
+#: ../lib/modules/bindDLZ.inc:652
 msgid "IP addresses (\"A/AAAA\" records)"
 msgstr "IP addresses (\"A/AAAA\" records)"
 
-#: ../lib/modules/fixed_ip.inc:119
+#: ../lib/modules/fixed_ip.inc:122
 msgid "IP list"
 msgstr "IP list"
 
@@ -5934,24 +5962,25 @@ msgid "Icon"
 msgstr "Icon"
 
 #: ../lib/modules/passwordSelfReset.inc:148
-#: ../lib/modules/passwordSelfReset.inc:646
+#: ../lib/modules/passwordSelfReset.inc:644
 msgid "Identification method"
 msgstr "Identification method"
 
-#: ../templates/masscreate.php:298 ../templates/masscreate.php:372
+#: ../templates/upload/masscreate.php:324
+#: ../templates/upload/masscreate.php:398
 msgid "Identifier"
 msgstr "Identifier"
 
 #: ../lib/modules/sambaSamAccount.inc:239
 #: ../lib/modules/sambaSamAccount.inc:1473
-#: ../lib/modules/sambaSamAccount.inc:1943
+#: ../lib/modules/sambaSamAccount.inc:1941
 msgid "Idle time limit"
 msgstr "Idle time limit"
 
 #: ../lib/modules/freeRadius.inc:112 ../lib/modules/freeRadius.inc:153
 #: ../lib/modules/freeRadius.inc:230 ../lib/modules/freeRadius.inc:270
 #: ../lib/modules/freeRadius.inc:316 ../lib/modules/freeRadius.inc:371
-#: ../lib/modules/freeRadius.inc:699
+#: ../lib/modules/freeRadius.inc:697
 msgid "Idle timeout"
 msgstr "Idle timeout"
 
@@ -6003,6 +6032,14 @@ msgstr "If checked password does not expire."
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "If checked password does not expire. (Setting X-Flag)"
 
+#: ../help/help.inc:293
+msgid ""
+"If checked then also users who did not setup a second factor are able to "
+"login."
+msgstr ""
+"If checked then also users who did not setup a second factor are able to "
+"login."
+
 #: ../lib/modules/windowsUser.inc:214
 msgid ""
 "If checked then the account is locked. You may only unlock accounts but not "
@@ -6104,7 +6141,7 @@ msgstr ""
 "destroy a NoOp priority 1 extension for a given peer who registers or "
 "unregisters with Asterisk."
 
-#: ../lib/modules/puppetClient.inc:126
+#: ../lib/modules/puppetClient.inc:129
 msgid "If set then only these classes are allowed. One class per line."
 msgstr "If set then only these classes are allowed. One class per line."
 
@@ -6142,7 +6179,7 @@ msgid ""
 msgstr ""
 "If the LDAP attribute has no value then the checkbox is set to this value."
 
-#: ../lib/modules/zarafaUser.inc:111
+#: ../lib/modules/zarafaUser.inc:114
 msgid ""
 "If the mailbox size reaches the soft quota limit, the user will not be able "
 "to send email until the size of the mailbox is reduced."
@@ -6313,7 +6350,7 @@ msgstr ""
 "If your server runs on another port then add a comma and the port number "
 "after the server."
 
-#: ../lib/modules/windowsUser.inc:386 ../lib/modules/inetOrgPerson.inc:876
+#: ../lib/modules/windowsUser.inc:386 ../lib/modules/inetOrgPerson.inc:874
 msgid "Image cropping"
 msgstr "Image cropping"
 
@@ -6327,7 +6364,7 @@ msgstr "Image not available"
 msgid "Import"
 msgstr "Import"
 
-#: ../templates/pdfedit/pdfmain.php:220 ../templates/pdfedit/pdfmain.php:221
+#: ../templates/pdfedit/pdfmain.php:265 ../templates/pdfedit/pdfmain.php:266
 #: ../help/help.inc:248
 msgid "Import PDF structures"
 msgstr "Import PDF structures"
@@ -6336,13 +6373,13 @@ msgstr "Import PDF structures"
 msgid "Import from server"
 msgstr "Import from server"
 
-#: ../templates/profedit/profilemain.php:208
-#: ../templates/profedit/profilemain.php:209 ../help/help.inc:230
+#: ../templates/profedit/profilemain.php:249
+#: ../templates/profedit/profilemain.php:250 ../help/help.inc:230
 msgid "Import profiles"
 msgstr "Import profiles"
 
-#: ../templates/pdfedit/pdfmain.php:113
-#: ../templates/profedit/profilemain.php:129
+#: ../templates/pdfedit/pdfmain.php:446
+#: ../templates/profedit/profilemain.php:407
 msgid "Import successful"
 msgstr "Import successful"
 
@@ -6362,7 +6399,7 @@ msgstr ""
 "In passthrough mode, users are allowed to print without any impact on their "
 "quota or account balance."
 
-#: ../lib/modules/fixed_ip.inc:115
+#: ../lib/modules/fixed_ip.inc:118
 msgid "Inactive hosts will not be able to get an address from the DHCP server."
 msgstr ""
 "Inactive hosts will not be able to get an address from the DHCP server."
@@ -6371,22 +6408,22 @@ msgstr ""
 msgid "Include system attributes"
 msgstr "Include system attributes"
 
-#: ../lib/tools/serverInfo.inc:53
+#: ../lib/tools/serverInfo.inc:54
 msgid "Information about the LDAP server."
 msgstr "Information about the LDAP server."
 
 #: ../lib/modules/sambaSamAccount.inc:234
 #: ../lib/modules/sambaSamAccount.inc:361
 #: ../lib/modules/sambaSamAccount.inc:1459
-#: ../lib/modules/sambaSamAccount.inc:1938
+#: ../lib/modules/sambaSamAccount.inc:1936
 msgid "Inherit client startup configuration"
 msgstr "Inherit client startup configuration"
 
-#: ../templates/schema/schema.php:396 ../templates/schema/schema.php:417
+#: ../templates/schema/schema.php:397 ../templates/schema/schema.php:418
 msgid "Inherited from"
 msgstr "Inherited from"
 
-#: ../templates/schema/schema.php:157 ../templates/schema/schema.php:353
+#: ../templates/schema/schema.php:158 ../templates/schema/schema.php:354
 msgid "Inherits from"
 msgstr "Inherits from"
 
@@ -6394,38 +6431,38 @@ msgstr "Inherits from"
 msgid "Initial folders"
 msgstr "Initial folders"
 
-#: ../lib/modules/pykotaUser.inc:249
+#: ../lib/modules/pykotaUser.inc:252
 msgid "Initial payment"
 msgstr "Initial payment"
 
 #: ../lib/modules/sambaSamAccount.inc:235
 #: ../lib/modules/sambaSamAccount.inc:364
 #: ../lib/modules/sambaSamAccount.inc:1461
-#: ../lib/modules/sambaSamAccount.inc:1939
+#: ../lib/modules/sambaSamAccount.inc:1937
 msgid "Initial program"
 msgstr "Initial program"
 
 #: ../lib/modules/windowsUser.inc:146 ../lib/modules/windowsUser.inc:436
 #: ../lib/modules/windowsUser.inc:820 ../lib/modules/windowsUser.inc:1089
-#: ../lib/modules/windowsUser.inc:2431 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:178 ../lib/modules/inetOrgPerson.inc:330
-#: ../lib/modules/inetOrgPerson.inc:637 ../lib/modules/inetOrgPerson.inc:864
-#: ../lib/modules/inetOrgPerson.inc:1268 ../lib/modules/inetOrgPerson.inc:1271
-#: ../lib/modules/inetOrgPerson.inc:2010 ../lib/modules/inetOrgPerson.inc:2762
-#: ../lib/modules/inetOrgPerson.inc:3692 ../lib/modules/inetOrgPerson.inc:3728
+#: ../lib/modules/windowsUser.inc:2429 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:176 ../lib/modules/inetOrgPerson.inc:328
+#: ../lib/modules/inetOrgPerson.inc:635 ../lib/modules/inetOrgPerson.inc:862
+#: ../lib/modules/inetOrgPerson.inc:1266 ../lib/modules/inetOrgPerson.inc:1269
+#: ../lib/modules/inetOrgPerson.inc:2006 ../lib/modules/inetOrgPerson.inc:2758
+#: ../lib/modules/inetOrgPerson.inc:3672 ../lib/modules/inetOrgPerson.inc:3708
 msgid "Initials"
 msgstr "Initials"
 
-#: ../templates/serverInfo.php:282 ../templates/serverInfo.php:368
+#: ../templates/serverInfo.php:283 ../templates/serverInfo.php:369
 msgid "Initiated"
 msgstr "Initiated"
 
-#: ../lib/modules/quota.inc:57 ../lib/modules/systemQuotas.inc:105
+#: ../lib/modules/quota.inc:60 ../lib/modules/systemQuotas.inc:108
 msgid "Inode hard quota"
 msgstr "Inode hard quota"
 
-#: ../lib/modules/quota.inc:57 ../lib/modules/quota.inc:58
-#: ../lib/modules/systemQuotas.inc:105 ../lib/modules/systemQuotas.inc:106
+#: ../lib/modules/quota.inc:60 ../lib/modules/quota.inc:61
+#: ../lib/modules/systemQuotas.inc:108 ../lib/modules/systemQuotas.inc:109
 msgid ""
 "Inode hard quota contains invalid characters. Only natural numbers are "
 "allowed."
@@ -6433,16 +6470,16 @@ msgstr ""
 "Inode hard quota contains invalid characters. Only natural numbers are "
 "allowed."
 
-#: ../lib/modules/quota.inc:61 ../lib/modules/systemQuotas.inc:109
+#: ../lib/modules/quota.inc:64 ../lib/modules/systemQuotas.inc:112
 msgid "Inode quota"
 msgstr "Inode quota"
 
-#: ../lib/modules/quota.inc:55 ../lib/modules/systemQuotas.inc:103
+#: ../lib/modules/quota.inc:58 ../lib/modules/systemQuotas.inc:106
 msgid "Inode soft quota"
 msgstr "Inode soft quota"
 
-#: ../lib/modules/quota.inc:55 ../lib/modules/quota.inc:56
-#: ../lib/modules/systemQuotas.inc:103 ../lib/modules/systemQuotas.inc:104
+#: ../lib/modules/quota.inc:58 ../lib/modules/quota.inc:59
+#: ../lib/modules/systemQuotas.inc:106 ../lib/modules/systemQuotas.inc:107
 msgid ""
 "Inode soft quota contains invalid characters. Only natural numbers are "
 "allowed."
@@ -6450,12 +6487,12 @@ msgstr ""
 "Inode soft quota contains invalid characters. Only natural numbers are "
 "allowed."
 
-#: ../lib/modules/quota.inc:61 ../lib/modules/quota.inc:62
-#: ../lib/modules/systemQuotas.inc:109 ../lib/modules/systemQuotas.inc:110
+#: ../lib/modules/quota.inc:64 ../lib/modules/quota.inc:65
+#: ../lib/modules/systemQuotas.inc:112 ../lib/modules/systemQuotas.inc:113
 msgid "Inode soft quota must be smaller than inode hard quota."
 msgstr "Inode soft quota must be smaller than inode hard quota."
 
-#: ../templates/selfService/adminMain.php:675
+#: ../templates/selfService/adminMain.php:728
 msgid "Input fields"
 msgstr "Input fields"
 
@@ -6463,8 +6500,8 @@ msgstr "Input fields"
 #: ../lib/modules/asteriskAccount.inc:277
 #: ../lib/modules/asteriskAccount.inc:391
 #: ../lib/modules/asteriskAccount.inc:652
-#: ../lib/modules/asteriskAccount.inc:996
-#: ../lib/modules/asteriskAccount.inc:1258
+#: ../lib/modules/asteriskAccount.inc:994
+#: ../lib/modules/asteriskAccount.inc:1256
 msgid "Insecure"
 msgstr "Insecure"
 
@@ -6480,11 +6517,11 @@ msgstr "Inserted user or group name in logon script."
 msgid "Inserted user or group name in profile path."
 msgstr "Inserted user or group name in profile path."
 
-#: ../lib/modules/fixed_ip.inc:475
+#: ../lib/modules/fixed_ip.inc:478
 msgid "Invalid MAC address."
 msgstr "Invalid MAC address."
 
-#: ../templates/massBuildAccounts.php:200
+#: ../templates/upload/massBuildAccounts.php:211
 msgid "Invalid RDN attribute!"
 msgstr "Invalid RDN attribute!"
 
@@ -6492,7 +6529,7 @@ msgstr "Invalid RDN attribute!"
 msgid "Invalid RDN value"
 msgstr "Invalid RDN value"
 
-#: ../lib/modules/fixed_ip.inc:484
+#: ../lib/modules/fixed_ip.inc:487
 msgid "Invalid description."
 msgstr "Invalid description."
 
@@ -6504,7 +6541,7 @@ msgstr "Invalid entry"
 msgid "Invalid format for the specification of additional attributes."
 msgstr "Invalid format for the specification of additional attributes."
 
-#: ../templates/config/mainlogin.php:135 ../lib/env.inc:152
+#: ../templates/config/mainlogin.php:140 ../lib/env.inc:152
 msgid "Invalid licence"
 msgstr "Invalid license"
 
@@ -6512,8 +6549,8 @@ msgstr "Invalid license"
 msgid "Invalid password for IMAP admin or other problem occured."
 msgstr "Invalid password for IMAP admin or other problem occured."
 
-#: ../lib/modules/ldapPublicKey.inc:655 ../lib/modules/inetOrgPerson.inc:3423
-#: ../lib/modules/customFields.inc:1427
+#: ../lib/modules/ldapPublicKey.inc:656 ../lib/modules/inetOrgPerson.inc:3425
+#: ../lib/modules/customFields.inc:1425
 msgid "Invalid request"
 msgstr "Invalid request"
 
@@ -6521,28 +6558,28 @@ msgstr "Invalid request"
 msgid "Invalid server name. Please enter \"server\" or \"server:port\"."
 msgstr "Invalid server name. Please enter \"server\" or \"server:port\"."
 
-#: ../lib/modules/passwordSelfReset.inc:1118
-#: ../lib/modules/passwordSelfReset.inc:1359
+#: ../lib/modules/passwordSelfReset.inc:1116
+#: ../lib/modules/passwordSelfReset.inc:1357
 #, php-format
 msgid "Invalid value in field \"%s\"."
 msgstr "Invalid value in field \"%s\"."
 
-#: ../lib/modules/kolabUser.inc:117 ../lib/modules/kolabUser.inc:124
-#: ../lib/modules/kolabUser.inc:186 ../lib/modules/kolabUser.inc:230
-#: ../lib/modules/kolabUser.inc:315 ../lib/modules/kolabUser.inc:717
-#: ../lib/modules/kolabUser.inc:852
+#: ../lib/modules/kolabUser.inc:120 ../lib/modules/kolabUser.inc:127
+#: ../lib/modules/kolabUser.inc:189 ../lib/modules/kolabUser.inc:233
+#: ../lib/modules/kolabUser.inc:318 ../lib/modules/kolabUser.inc:718
+#: ../lib/modules/kolabUser.inc:853
 msgid "Invitation policy"
 msgstr "Invitation policy"
 
-#: ../lib/modules/kolabUser.inc:128
+#: ../lib/modules/kolabUser.inc:131
 msgid "Invitation policy list"
 msgstr "Invitation policy list"
 
-#: ../lib/modules/range.inc:137
+#: ../lib/modules/range.inc:140
 msgid "It is not possible to delete all ranges."
 msgstr "It is not possible to delete all ranges."
 
-#: ../lib/modules/posixGroup.inc:660 ../lib/modules/posixAccount.inc:105
+#: ../lib/modules/posixGroup.inc:658 ../lib/modules/posixAccount.inc:105
 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 "
@@ -6553,73 +6590,73 @@ msgstr ""
 "warning set maxUID to a higher value."
 
 #: ../templates/config/jobList.php:194 ../templates/config/jobs.php:362
-#: ../lib/modules/pykotaUser.inc:284 ../lib/modules/pykotaUser.inc:387
-#: ../lib/modules/pykotaUser.inc:1013
+#: ../lib/modules/pykotaUser.inc:287 ../lib/modules/pykotaUser.inc:390
+#: ../lib/modules/pykotaUser.inc:1014
 msgid "Job history"
 msgstr "Job history"
 
-#: ../lib/modules/pykotaUser.inc:156 ../lib/modules/pykotaUser.inc:289
-#: ../lib/modules/pykotaUser.inc:295 ../lib/modules/pykotaUser.inc:327
+#: ../lib/modules/pykotaUser.inc:159 ../lib/modules/pykotaUser.inc:292
+#: ../lib/modules/pykotaUser.inc:298 ../lib/modules/pykotaUser.inc:330
 msgid "Job suffix"
 msgstr "Job suffix"
 
 #: ../lib/types/user.inc:113 ../lib/modules/windowsUser.inc:298
 #: ../lib/modules/windowsUser.inc:670 ../lib/modules/windowsUser.inc:765
 #: ../lib/modules/windowsUser.inc:868 ../lib/modules/windowsUser.inc:995
-#: ../lib/modules/windowsUser.inc:1129 ../lib/modules/windowsUser.inc:2454
-#: ../lib/modules/windowsUser.inc:3221 ../lib/modules/inetOrgPerson.inc:91
-#: ../lib/modules/inetOrgPerson.inc:165 ../lib/modules/inetOrgPerson.inc:232
-#: ../lib/modules/inetOrgPerson.inc:346 ../lib/modules/inetOrgPerson.inc:610
-#: ../lib/modules/inetOrgPerson.inc:656 ../lib/modules/inetOrgPerson.inc:660
-#: ../lib/modules/inetOrgPerson.inc:1527 ../lib/modules/inetOrgPerson.inc:1530
-#: ../lib/modules/inetOrgPerson.inc:1983 ../lib/modules/inetOrgPerson.inc:2773
-#: ../lib/modules/inetOrgPerson.inc:3674 ../lib/modules/inetOrgPerson.inc:3723
+#: ../lib/modules/windowsUser.inc:1129 ../lib/modules/windowsUser.inc:2452
+#: ../lib/modules/windowsUser.inc:3219 ../lib/modules/inetOrgPerson.inc:89
+#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:230
+#: ../lib/modules/inetOrgPerson.inc:344 ../lib/modules/inetOrgPerson.inc:608
+#: ../lib/modules/inetOrgPerson.inc:654 ../lib/modules/inetOrgPerson.inc:658
+#: ../lib/modules/inetOrgPerson.inc:1525 ../lib/modules/inetOrgPerson.inc:1528
+#: ../lib/modules/inetOrgPerson.inc:1979 ../lib/modules/inetOrgPerson.inc:2769
+#: ../lib/modules/inetOrgPerson.inc:3654 ../lib/modules/inetOrgPerson.inc:3703
 msgid "Job title"
 msgstr "Job title"
 
-#: ../lib/modules/windowsUser.inc:299 ../lib/modules/inetOrgPerson.inc:657
-#: ../lib/modules/inetOrgPerson.inc:661
+#: ../lib/modules/windowsUser.inc:299 ../lib/modules/inetOrgPerson.inc:655
+#: ../lib/modules/inetOrgPerson.inc:659
 msgid "Job title of user: President, department manager, ..."
 msgstr "Job title of user: President, department manager, ..."
 
-#: ../templates/config/confmodules.php:187 ../templates/config/jobList.php:171
+#: ../templates/config/confmodules.php:197 ../templates/config/jobList.php:171
 #: ../templates/config/jobs.php:174 ../templates/config/jobs.php:356
-#: ../templates/config/confmain.php:228
-#: ../templates/config/moduleSettings.php:186
-#: ../templates/config/conftypes.php:205
+#: ../templates/config/confmain.php:231
+#: ../templates/config/moduleSettings.php:191
+#: ../templates/config/conftypes.php:224
 msgid "Jobs"
 msgstr "Jobs"
 
-#: ../lib/lists.inc:297
+#: ../lib/lists.inc:299
 msgid "Jump 10 pages backward"
 msgstr "Jump 10 pages backward"
 
-#: ../lib/lists.inc:322
+#: ../lib/lists.inc:324
 msgid "Jump 10 pages forward"
 msgstr "Jump 10 pages forward"
 
-#: ../templates/schema/schema.php:255
+#: ../templates/schema/schema.php:256
 msgid "Jump to a matching rule"
 msgstr "Jump to a matching rule"
 
-#: ../templates/schema/schema.php:114
+#: ../templates/schema/schema.php:115
 msgid "Jump to an attribute type"
 msgstr "Jump to an attribute type"
 
-#: ../templates/schema/schema.php:308 ../templates/schema/schema.php:358
-#: ../templates/schema/schema.php:373
+#: ../templates/schema/schema.php:309 ../templates/schema/schema.php:359
+#: ../templates/schema/schema.php:374
 msgid "Jump to an object class"
 msgstr "Jump to an object class"
 
-#: ../lib/lists.inc:292
+#: ../lib/lists.inc:294
 msgid "Jump to first page"
 msgstr "Jump to first page"
 
-#: ../lib/lists.inc:327
+#: ../lib/lists.inc:329
 msgid "Jump to last page"
 msgstr "Jump to last page"
 
-#: ../lib/modules/posixAccount.inc:400 ../lib/modules/inetOrgPerson.inc:841
+#: ../lib/modules/posixAccount.inc:400 ../lib/modules/inetOrgPerson.inc:839
 msgid "K5KEY is only needed if you use Kerberos with smbk5pwd."
 msgstr "K5KEY is only needed if you use Kerberos with smbk5pwd."
 
@@ -6627,7 +6664,7 @@ msgstr "K5KEY is only needed if you use Kerberos with smbk5pwd."
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: ../lib/modules/kolabGroup.inc:74 ../lib/modules/kolabUser.inc:80
+#: ../lib/modules/kolabGroup.inc:74 ../lib/modules/kolabUser.inc:83
 msgid "Kolab"
 msgstr "Kolab"
 
@@ -6675,12 +6712,12 @@ msgstr ""
 msgid "LAM configuration"
 msgstr "LAM configuration"
 
-#: ../templates/massBuildAccounts.php:238
+#: ../templates/upload/massBuildAccounts.php:248
 msgid "LAM has checked your input and is now ready to create the accounts."
 msgstr "LAM has checked your input and is now ready to create the accounts."
 
 #: ../lib/modules/posixGroup.inc:501 ../lib/modules/posixAccount.inc:399
-#: ../lib/modules/inetOrgPerson.inc:840 ../lib/modules/customFields.inc:141
+#: ../lib/modules/inetOrgPerson.inc:838 ../lib/modules/customFields.inc:141
 msgid ""
 "LAM supports CRYPT, CRYPT-SHA512, SHA, SSHA, MD5 and SMD5 to generate the "
 "hash value of passwords. SSHA and CRYPT are the most common but CRYPT does "
@@ -6692,7 +6729,7 @@ msgstr ""
 "not support passwords greater than 8 letters. We do not recommend to use "
 "plain text passwords."
 
-#: ../templates/tests/index.php:50
+#: ../templates/tests/index.php:51
 msgid "LAM tests"
 msgstr "LAM tests"
 
@@ -6700,12 +6737,12 @@ msgstr "LAM tests"
 msgid "LAM user password"
 msgstr "LAM user password"
 
-#: ../templates/massDoUpload.php:132
+#: ../lib/upload.inc:150
 #, php-format
 msgid "LAM was unable to create account %s! An LDAP error occured."
 msgstr "LAM was unable to create account %s! An LDAP error occured."
 
-#: ../lib/modules/sambaGroupMapping.inc:604
+#: ../lib/modules/sambaGroupMapping.inc:602
 msgid "LAM was unable to find a Samba 3 domain with this name!"
 msgstr "LAM was unable to find a Samba 3 domain with this name!"
 
@@ -6717,14 +6754,14 @@ msgstr "LAM was unable to find a domain with this name!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM was unable to find a group with this name!"
 
-#: ../lib/modules/posixAccount.inc:2487 ../lib/modules/posixAccount.inc:2548
-#: ../lib/modules/windowsUser.inc:2372 ../lib/modules/nisNetGroupUser.inc:598
-#: ../lib/modules/groupOfNamesUser.inc:467
+#: ../lib/modules/posixAccount.inc:2485 ../lib/modules/posixAccount.inc:2546
+#: ../lib/modules/windowsUser.inc:2372 ../lib/modules/nisNetGroupUser.inc:599
+#: ../lib/modules/groupOfNamesUser.inc:465
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM was unable to modify group memberships for group: %s"
 
-#: ../lib/modules/organizationalRoleUser.inc:399
+#: ../lib/modules/organizationalRoleUser.inc:397
 #, php-format
 msgid "LAM was unable to modify memberships for role: %s"
 msgstr "LAM was unable to modify memberships for role: %s"
@@ -6773,10 +6810,10 @@ msgstr "LDAP"
 msgid "LDAP + program"
 msgstr "LDAP + program"
 
-#: ../templates/config/confmodules.php:102 ../templates/config/jobList.php:88
-#: ../templates/config/jobs.php:87 ../templates/config/confmain.php:132
-#: ../templates/config/moduleSettings.php:101
-#: ../templates/config/conftypes.php:120
+#: ../templates/config/confmodules.php:112 ../templates/config/jobList.php:88
+#: ../templates/config/jobs.php:87 ../templates/config/confmain.php:135
+#: ../templates/config/moduleSettings.php:106
+#: ../templates/config/conftypes.php:139
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP Account Manager Configuration"
 
@@ -6784,7 +6821,7 @@ msgstr "LDAP Account Manager Configuration"
 msgid "LDAP DN of default PPolicy password policy entry."
 msgstr "LDAP DN of default PPolicy password policy entry."
 
-#: ../templates/multiEdit.php:203 ../templates/config/conftypes.php:420
+#: ../templates/multiEdit.php:226 ../templates/config/conftypes.php:431
 msgid "LDAP Suffix is invalid!"
 msgstr "LDAP Suffix is invalid!"
 
@@ -6792,7 +6829,7 @@ msgstr "LDAP Suffix is invalid!"
 msgid "LDAP connection ok."
 msgstr "LDAP connection ok."
 
-#: ../templates/serverInfo.php:182
+#: ../templates/serverInfo.php:183
 msgid "LDAP entries"
 msgstr "LDAP entries"
 
@@ -6808,12 +6845,12 @@ msgstr "LDAP entries that are member of this list."
 msgid "LDAP entries that moderate this list (e.g. approve mails)."
 msgstr "LDAP entries that moderate this list (e.g. approve mails)."
 
-#: ../templates/login.php:662 ../lib/account.inc:1321
+#: ../templates/login.php:683 ../lib/account.inc:1327
 msgid "LDAP error, server says:"
 msgstr "LDAP error, server says:"
 
-#: ../templates/multiEdit.php:119 ../templates/config/confmain.php:515
-#: ../help/help.inc:309
+#: ../templates/multiEdit.php:142 ../templates/config/confmain.php:518
+#: ../help/help.inc:321
 msgid "LDAP filter"
 msgstr "LDAP filter"
 
@@ -6833,11 +6870,11 @@ msgstr ""
 "LDAP filter to specify members of this list (e.g. \"((objectclass=qmailUser)"
 "(employeeType=accountant))\")."
 
-#: ../lib/modules.inc:1366
+#: ../lib/modules.inc:1374
 msgid "LDAP operation successful."
 msgstr "LDAP operation successful."
 
-#: ../templates/selfService/adminMain.php:439
+#: ../templates/selfService/adminMain.php:455
 msgid "LDAP password"
 msgstr "LDAP password"
 
@@ -6845,43 +6882,43 @@ msgstr "LDAP password"
 msgid "LDAP said"
 msgstr "LDAP said"
 
-#: ../templates/config/confmain.php:492 ../help/help.inc:124
+#: ../templates/config/confmain.php:495 ../help/help.inc:124
 msgid "LDAP search"
 msgstr "LDAP search"
 
-#: ../templates/selfService/adminMain.php:431 ../help/help.inc:260
+#: ../templates/selfService/adminMain.php:447 ../help/help.inc:260
 msgid "LDAP search attribute"
 msgstr "LDAP search attribute"
 
-#: ../lib/account.inc:871
+#: ../lib/account.inc:877
 msgid "LDAP search failed! Please check your preferences."
 msgstr "LDAP search failed! Please check your preferences."
 
-#: ../templates/config/confmain.php:265 ../help/help.inc:126
+#: ../templates/config/confmain.php:268 ../help/help.inc:126
 msgid "LDAP search limit"
 msgstr "LDAP search limit"
 
-#: ../templates/login.php:473
+#: ../templates/login.php:482
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: ../lib/account.inc:862
+#: ../lib/account.inc:868
 msgid "LDAP sizelimit exceeded, not all entries are shown."
 msgstr "LDAP sizelimit exceeded, not all entries are shown."
 
-#: ../templates/multiEdit.php:86 ../templates/config/confmain.php:511
-#: ../templates/config/conftypes.php:265
-#: ../templates/selfService/adminMain.php:425
-#: ../templates/profedit/profilepage.php:207 ../help/help.inc:71
-#: ../help/help.inc:256 ../help/help.inc:307
+#: ../templates/multiEdit.php:105 ../templates/config/confmain.php:514
+#: ../templates/config/conftypes.php:284
+#: ../templates/selfService/adminMain.php:441
+#: ../templates/profedit/profilepage.php:219 ../help/help.inc:71
+#: ../help/help.inc:256 ../help/help.inc:319
 msgid "LDAP suffix"
 msgstr "LDAP suffix"
 
-#: ../templates/massDoUpload.php:86
+#: ../lib/upload.inc:194
 msgid "LDAP upload in progress. Please wait."
 msgstr "LDAP upload in progress. Please wait."
 
-#: ../templates/selfService/adminMain.php:436
+#: ../templates/selfService/adminMain.php:452
 msgid "LDAP user"
 msgstr "LDAP user"
 
@@ -6889,7 +6926,7 @@ msgstr "LDAP user"
 msgid "LDAP user and password"
 msgstr "LDAP user and password"
 
-#: ../templates/serverInfo.php:109
+#: ../templates/serverInfo.php:110
 msgid "LDAP version"
 msgstr "LDAP version"
 
@@ -6901,7 +6938,7 @@ msgstr "LDAP views based on nsview"
 msgid "LDIF Export"
 msgstr "LDIF Export"
 
-#: ../templates/multiEdit.php:448
+#: ../templates/multiEdit.php:471
 msgid "LDIF file"
 msgstr "LDIF file"
 
@@ -6914,13 +6951,15 @@ msgstr "LDIF import"
 msgid "LDIF import only supports version 1"
 msgstr "LDIF import only supports version 1"
 
+#: ../templates/config/confmain.php:550
+#: ../templates/selfService/adminMain.php:522
 #: ../lib/modules/customFields.inc:88 ../lib/modules/customFields.inc:517
-#: ../lib/modules/customFields.inc:1056 ../lib/modules/customFields.inc:1729
-#: ../lib/modules/customFields.inc:3137
+#: ../lib/modules/customFields.inc:1054 ../lib/modules/customFields.inc:1727
+#: ../lib/modules/customFields.inc:3135 ../help/help.inc:288
 msgid "Label"
 msgstr "Label"
 
-#: ../templates/tests/lamdaemonTest.php:201
+#: ../templates/tests/lamdaemonTest.php:202
 msgid ""
 "Lamdaemon path does not end with \".pl\". Did you enter the full path to the "
 "script?"
@@ -6928,61 +6967,61 @@ msgstr ""
 "Lamdaemon path does not end with \".pl\". Did you enter the full path to the "
 "script?"
 
-#: ../templates/tests/lamdaemonTest.php:185
+#: ../templates/tests/lamdaemonTest.php:186
 msgid "Lamdaemon server and path"
 msgstr "Lamdaemon server and path"
 
-#: ../templates/config/confmain.php:372
+#: ../templates/config/confmain.php:375
 msgid "Lamdaemon settings"
 msgstr "Lamdaemon settings"
 
-#: ../templates/tests/lamdaemonTest.php:135
+#: ../templates/tests/lamdaemonTest.php:136
 msgid "Lamdaemon successfully run."
 msgstr "Lamdaemon successfully run."
 
-#: ../templates/tests/index.php:52 ../templates/tests/lamdaemonTest.php:52
-#: ../lib/tools/tests.inc:110
+#: ../templates/tests/index.php:53 ../templates/tests/lamdaemonTest.php:53
+#: ../lib/tools/tests.inc:111
 msgid "Lamdaemon test"
 msgstr "Lamdaemon test"
 
-#: ../templates/tests/lamdaemonTest.php:288
+#: ../templates/tests/lamdaemonTest.php:290
 msgid "Lamdaemon test finished."
 msgstr "Lamdaemon test finished."
 
-#: ../templates/tests/lamdaemonTest.php:273
+#: ../templates/tests/lamdaemonTest.php:275
 msgid "Lamdaemon version"
 msgstr "Lamdaemon version"
 
-#: ../templates/tests/lamdaemonTest.php:281
+#: ../templates/tests/lamdaemonTest.php:283
 msgid "Lamdaemon: Quota module installed"
 msgstr "Lamdaemon: Quota module installed"
 
-#: ../templates/tests/lamdaemonTest.php:278
+#: ../templates/tests/lamdaemonTest.php:280
 msgid "Lamdaemon: check NSS LDAP"
 msgstr "Lamdaemon: check NSS LDAP"
 
-#: ../templates/tests/lamdaemonTest.php:283
+#: ../templates/tests/lamdaemonTest.php:285
 msgid "Lamdaemon: read quotas"
 msgstr "Lamdaemon: read quotas"
 
-#: ../templates/login.php:409
-#: ../templates/selfService/selfServiceLogin.php:360
+#: ../templates/login.php:417
+#: ../templates/selfService/selfServiceLogin.php:375
 msgid "Language"
 msgstr "Language"
 
-#: ../templates/config/confmain.php:673
+#: ../templates/config/confmain.php:710
 msgid "Language is not defined!"
 msgstr "Language is not defined!"
 
-#: ../templates/config/confmain.php:333
+#: ../templates/config/confmain.php:336
 msgid "Language settings"
 msgstr "Language settings"
 
 #: ../lib/modules/mitKerberos.inc:144 ../lib/modules/mitKerberos.inc:256
-#: ../lib/modules/mitKerberos.inc:404 ../lib/modules/mitKerberos.inc:805
+#: ../lib/modules/mitKerberos.inc:404 ../lib/modules/mitKerberos.inc:803
 #: ../lib/modules/windowsUser.inc:278 ../lib/modules/windowsUser.inc:865
-#: ../lib/modules/windowsUser.inc:1211 ../lib/modules/windowsUser.inc:2503
-#: ../lib/modules/windowsUser.inc:3219
+#: ../lib/modules/windowsUser.inc:1211 ../lib/modules/windowsUser.inc:2501
+#: ../lib/modules/windowsUser.inc:3217
 msgid "Last login"
 msgstr "Last login"
 
@@ -6990,37 +7029,37 @@ msgstr "Last login"
 #: ../lib/modules/selfRegistration.inc:224 ../lib/modules/windowsUser.inc:178
 #: ../lib/modules/windowsUser.inc:418 ../lib/modules/windowsUser.inc:828
 #: ../lib/modules/windowsUser.inc:960 ../lib/modules/windowsUser.inc:1086
-#: ../lib/modules/windowsUser.inc:2439 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:159 ../lib/modules/inetOrgPerson.inc:321
-#: ../lib/modules/inetOrgPerson.inc:556 ../lib/modules/inetOrgPerson.inc:668
-#: ../lib/modules/inetOrgPerson.inc:1259 ../lib/modules/inetOrgPerson.inc:1262
-#: ../lib/modules/inetOrgPerson.inc:1985 ../lib/modules/inetOrgPerson.inc:2514
-#: ../lib/modules/inetOrgPerson.inc:3715
+#: ../lib/modules/windowsUser.inc:2437 ../lib/modules/inetOrgPerson.inc:66
+#: ../lib/modules/inetOrgPerson.inc:157 ../lib/modules/inetOrgPerson.inc:319
+#: ../lib/modules/inetOrgPerson.inc:554 ../lib/modules/inetOrgPerson.inc:666
+#: ../lib/modules/inetOrgPerson.inc:1257 ../lib/modules/inetOrgPerson.inc:1260
+#: ../lib/modules/inetOrgPerson.inc:1981 ../lib/modules/inetOrgPerson.inc:2510
+#: ../lib/modules/inetOrgPerson.inc:3695
 msgid "Last name"
 msgstr "Last name"
 
 #: ../lib/modules/windowsUser.inc:960 ../lib/modules/windowsUser.inc:961
-#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
+#: ../lib/modules/inetOrgPerson.inc:66 ../lib/modules/inetOrgPerson.inc:67
 msgid "Last name contains invalid characters or is empty!"
 msgstr "Last name contains invalid characters or is empty!"
 
-#: ../lib/modules/windowsUser.inc:179 ../lib/modules/inetOrgPerson.inc:669
+#: ../lib/modules/windowsUser.inc:179 ../lib/modules/inetOrgPerson.inc:667
 msgid "Last name of user. Only letters, - and spaces are allowed."
 msgstr "Last name of user. Only letters, - and spaces are allowed."
 
 #: ../lib/modules/mitKerberos.inc:140 ../lib/modules/mitKerberos.inc:255
-#: ../lib/modules/mitKerberos.inc:396 ../lib/modules/mitKerberos.inc:801
+#: ../lib/modules/mitKerberos.inc:396 ../lib/modules/mitKerberos.inc:799
 #: ../lib/modules/sambaSamAccount.inc:397
 #: ../lib/modules/sambaSamAccount.inc:1114
 #: ../lib/modules/sambaSamAccount.inc:1894
-#: ../lib/modules/sambaSamAccount.inc:2332 ../lib/modules/ppolicyUser.inc:92
-#: ../lib/modules/ppolicyUser.inc:141 ../lib/modules/ppolicyUser.inc:399
+#: ../lib/modules/sambaSamAccount.inc:2330 ../lib/modules/ppolicyUser.inc:92
+#: ../lib/modules/ppolicyUser.inc:141 ../lib/modules/ppolicyUser.inc:397
 #: ../lib/modules/windowsUser.inc:274 ../lib/modules/windowsUser.inc:862
-#: ../lib/modules/windowsUser.inc:1205 ../lib/modules/windowsUser.inc:2501
-#: ../lib/modules/windowsUser.inc:2625 ../lib/modules/windowsUser.inc:3218
+#: ../lib/modules/windowsUser.inc:1205 ../lib/modules/windowsUser.inc:2499
+#: ../lib/modules/windowsUser.inc:2623 ../lib/modules/windowsUser.inc:3216
 #: ../lib/modules/shadowAccount.inc:167 ../lib/modules/shadowAccount.inc:201
 #: ../lib/modules/shadowAccount.inc:365 ../lib/modules/shadowAccount.inc:530
-#: ../lib/modules/shadowAccount.inc:568 ../lib/modules/shadowAccount.inc:761
+#: ../lib/modules/shadowAccount.inc:566 ../lib/modules/shadowAccount.inc:759
 msgid "Last password change"
 msgstr "Last password change"
 
@@ -7033,14 +7072,14 @@ msgstr "Last password change (read-only)"
 #: ../lib/modules/asteriskAccount.inc:298
 #: ../lib/modules/asteriskAccount.inc:544
 #: ../lib/modules/asteriskAccount.inc:758
-#: ../lib/modules/asteriskAccount.inc:1017
-#: ../lib/modules/asteriskAccount.inc:1300
+#: ../lib/modules/asteriskAccount.inc:1015
+#: ../lib/modules/asteriskAccount.inc:1298
 msgid "Last qualify milliseconds"
 msgstr "Last qualify milliseconds"
 
 #: ../lib/modules/dhcp_settings.inc:158 ../lib/modules/dhcp_settings.inc:214
 #: ../lib/modules/dhcp_settings.inc:229 ../lib/modules/dhcp_settings.inc:261
-#: ../lib/modules/dhcp_settings.inc:571 ../lib/modules/dhcp_settings.inc:678
+#: ../lib/modules/dhcp_settings.inc:571 ../lib/modules/dhcp_settings.inc:676
 msgid "Lease time"
 msgstr "Lease time"
 
@@ -7055,10 +7094,10 @@ msgstr "License data"
 
 #: ../lib/modules/pykotaGroup.inc:125 ../lib/modules/pykotaGroup.inc:135
 #: ../lib/modules/pykotaGroup.inc:173 ../lib/modules/pykotaGroup.inc:182
-#: ../lib/modules/pykotaGroup.inc:227 ../lib/modules/pykotaGroup.inc:477
-#: ../lib/modules/pykotaUser.inc:128 ../lib/modules/pykotaUser.inc:166
-#: ../lib/modules/pykotaUser.inc:233 ../lib/modules/pykotaUser.inc:261
-#: ../lib/modules/pykotaUser.inc:397 ../lib/modules/pykotaUser.inc:901
+#: ../lib/modules/pykotaGroup.inc:227 ../lib/modules/pykotaGroup.inc:475
+#: ../lib/modules/pykotaUser.inc:131 ../lib/modules/pykotaUser.inc:169
+#: ../lib/modules/pykotaUser.inc:236 ../lib/modules/pykotaUser.inc:264
+#: ../lib/modules/pykotaUser.inc:400 ../lib/modules/pykotaUser.inc:902
 msgid "Limit type"
 msgstr "Limit type"
 
@@ -7073,19 +7112,19 @@ msgstr "Line ends"
 #: ../lib/modules/selfRegistration.inc:57
 #: ../lib/modules/selfRegistration.inc:202
 #: ../lib/modules/passwordSelfReset.inc:104
-#: ../lib/modules/passwordSelfReset.inc:656
+#: ../lib/modules/passwordSelfReset.inc:654
 msgid "Link text"
 msgstr "Link text"
 
-#: ../templates/selfService/adminMain.php:366
+#: ../templates/selfService/adminMain.php:382
 msgid "Link to self service login page for your users"
 msgstr "Link to self service login page for your users"
 
-#: ../templates/config/conftypes.php:276 ../help/help.inc:87
+#: ../templates/config/conftypes.php:295 ../help/help.inc:87
 msgid "List attributes"
 msgstr "List attributes"
 
-#: ../templates/config/conftypes.php:428
+#: ../templates/config/conftypes.php:439
 msgid "List attributes are invalid!"
 msgstr "List attributes are invalid!"
 
@@ -7095,7 +7134,7 @@ msgstr "List attributes are invalid!"
 #: ../lib/modules/zarafaAddressList.inc:141
 #: ../lib/modules/zarafaAddressList.inc:168
 #: ../lib/modules/zarafaAddressList.inc:187
-#: ../lib/modules/zarafaAddressList.inc:334
+#: ../lib/modules/zarafaAddressList.inc:332
 msgid "List name"
 msgstr "List name"
 
@@ -7111,7 +7150,7 @@ msgstr ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
 
-#: ../templates/config/confmain.php:667
+#: ../templates/config/confmain.php:704
 msgid "List of admin users is empty or invalid!"
 msgstr "List of admin users is empty or invalid!"
 
@@ -7128,15 +7167,15 @@ msgstr "List of disallowed codecs."
 msgid "List of entries to be deleted:"
 msgstr "List of entries to be deleted:"
 
-#: ../templates/config/confmain.php:507
+#: ../templates/config/confmain.php:510
 msgid "List of valid users"
 msgstr "List of valid users"
 
-#: ../templates/serverInfo.php:152
+#: ../templates/serverInfo.php:153
 msgid "Listeners"
 msgstr "Listeners"
 
-#: ../lib/modules.inc:1266 ../help/help.inc:236
+#: ../lib/modules.inc:1274 ../help/help.inc:236
 msgid "Load profile"
 msgstr "Load profile"
 
@@ -7173,7 +7212,7 @@ msgstr "Local address"
 #: ../lib/modules/inetLocalMailRecipient.inc:87
 #: ../lib/modules/inetLocalMailRecipient.inc:118
 #: ../lib/modules/inetLocalMailRecipient.inc:132
-#: ../lib/modules/inetLocalMailRecipient.inc:355
+#: ../lib/modules/inetLocalMailRecipient.inc:353
 msgid "Local address list"
 msgstr "Local address list"
 
@@ -7184,28 +7223,28 @@ msgstr "Local group"
 #: ../lib/modules/sambaGroupMapping.inc:115
 #: ../lib/modules/sambaGroupMapping.inc:166
 #: ../lib/modules/sambaGroupMapping.inc:388
-#: ../lib/modules/sambaGroupMapping.inc:556
+#: ../lib/modules/sambaGroupMapping.inc:554
 msgid "Local members"
 msgstr "Local members"
 
 #: ../lib/types/host.inc:97 ../lib/modules/ipHost.inc:73
 #: ../lib/modules/ipHost.inc:97 ../lib/modules/ipHost.inc:113
-#: ../lib/modules/ipHost.inc:140 ../lib/modules/ipHost.inc:304
+#: ../lib/modules/ipHost.inc:140 ../lib/modules/ipHost.inc:302
 #: ../lib/modules/windowsHost.inc:82 ../lib/modules/windowsHost.inc:106
 #: ../lib/modules/windowsHost.inc:121 ../lib/modules/windowsHost.inc:144
-#: ../lib/modules/windowsHost.inc:293 ../lib/modules/device.inc:77
-#: ../lib/modules/device.inc:109 ../lib/modules/device.inc:129
-#: ../lib/modules/device.inc:178 ../lib/modules/device.inc:410
+#: ../lib/modules/windowsHost.inc:291 ../lib/modules/device.inc:80
+#: ../lib/modules/device.inc:112 ../lib/modules/device.inc:132
+#: ../lib/modules/device.inc:181 ../lib/modules/device.inc:411
 #: ../lib/modules/windowsUser.inc:150 ../lib/modules/windowsUser.inc:466
 #: ../lib/modules/windowsUser.inc:821 ../lib/modules/windowsUser.inc:921
-#: ../lib/modules/windowsUser.inc:1096 ../lib/modules/windowsUser.inc:2432
-#: ../lib/modules/windowsUser.inc:2620 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:193 ../lib/modules/inetOrgPerson.inc:524
-#: ../lib/modules/inetOrgPerson.inc:571 ../lib/modules/inetOrgPerson.inc:799
-#: ../lib/modules/inetOrgPerson.inc:803 ../lib/modules/inetOrgPerson.inc:1333
-#: ../lib/modules/inetOrgPerson.inc:1336 ../lib/modules/inetOrgPerson.inc:2006
-#: ../lib/modules/inetOrgPerson.inc:2668 ../lib/modules/inetOrgPerson.inc:3650
-#: ../lib/modules/inetOrgPerson.inc:3717
+#: ../lib/modules/windowsUser.inc:1096 ../lib/modules/windowsUser.inc:2430
+#: ../lib/modules/windowsUser.inc:2618 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:191 ../lib/modules/inetOrgPerson.inc:522
+#: ../lib/modules/inetOrgPerson.inc:569 ../lib/modules/inetOrgPerson.inc:797
+#: ../lib/modules/inetOrgPerson.inc:801 ../lib/modules/inetOrgPerson.inc:1331
+#: ../lib/modules/inetOrgPerson.inc:1334 ../lib/modules/inetOrgPerson.inc:2002
+#: ../lib/modules/inetOrgPerson.inc:2664 ../lib/modules/inetOrgPerson.inc:3630
+#: ../lib/modules/inetOrgPerson.inc:3697
 msgid "Location"
 msgstr "Location"
 
@@ -7217,19 +7256,19 @@ msgstr "Location where new alias is stored."
 msgid "Lock"
 msgstr "Lock"
 
-#: ../templates/lists/changePassword.php:454
-#: ../templates/lists/changePassword.php:478
-#: ../templates/lists/changePassword.php:480
+#: ../templates/lists/changePassword.php:455
+#: ../templates/lists/changePassword.php:479
+#: ../templates/lists/changePassword.php:481
 #: ../lib/modules/ppolicyUser.inc:155
 msgid "Lock account"
 msgstr "Lock account"
 
-#: ../templates/lists/changePassword.php:270
+#: ../templates/lists/changePassword.php:271
 msgid "Lock account?"
 msgstr "Lock account?"
 
 #: ../lib/modules/posixGroup.inc:205 ../lib/modules/posixAccount.inc:279
-#: ../lib/modules/posixAccount.inc:1484 ../lib/modules/inetOrgPerson.inc:1648
+#: ../lib/modules/posixAccount.inc:1484 ../lib/modules/inetOrgPerson.inc:1646
 msgid "Lock password"
 msgstr "Lock password"
 
@@ -7244,10 +7283,10 @@ msgstr "Locked till"
 
 #: ../lib/types/ppolicyType.inc:83 ../lib/modules/ppolicy.inc:104
 #: ../lib/modules/ppolicy.inc:151 ../lib/modules/ppolicy.inc:171
-#: ../lib/modules/ppolicy.inc:261 ../lib/modules/ppolicy.inc:477
+#: ../lib/modules/ppolicy.inc:261 ../lib/modules/ppolicy.inc:475
 #: ../lib/modules/sambaDomain.inc:133 ../lib/modules/sambaDomain.inc:198
 #: ../lib/modules/sambaDomain.inc:223 ../lib/modules/sambaDomain.inc:340
-#: ../lib/modules/sambaDomain.inc:611
+#: ../lib/modules/sambaDomain.inc:609
 msgid "Lockout duration"
 msgstr "Lockout duration"
 
@@ -7261,13 +7300,13 @@ msgstr "Lockout time"
 
 #: ../lib/types/ppolicyType.inc:88 ../lib/modules/ppolicy.inc:124
 #: ../lib/modules/ppolicy.inc:150 ../lib/modules/ppolicy.inc:255
-#: ../lib/modules/ppolicy.inc:496
+#: ../lib/modules/ppolicy.inc:494
 msgid "Lockout users"
 msgstr "Lockout users"
 
 #: ../lib/modules/sambaDomain.inc:121 ../lib/modules/sambaDomain.inc:195
 #: ../lib/modules/sambaDomain.inc:225 ../lib/modules/sambaDomain.inc:316
-#: ../lib/modules/sambaDomain.inc:608
+#: ../lib/modules/sambaDomain.inc:606
 msgid "Lockout users after bad logon attempts"
 msgstr "Lockout users after bad logon attempts"
 
@@ -7283,11 +7322,11 @@ msgstr "Log destination"
 msgid "Log level"
 msgstr "Log level"
 
-#: ../templates/multiEdit.php:453
+#: ../templates/multiEdit.php:476
 msgid "Log output"
 msgstr "Log output"
 
-#: ../templates/main_header.php:128
+#: ../templates/main_header.php:126
 #, php-format
 msgid "Logged in as: %s"
 msgstr "Logged in as: %s"
@@ -7296,55 +7335,57 @@ msgstr "Logged in as: %s"
 msgid "Logging"
 msgstr "Logging"
 
-#: ../templates/login.php:446 ../templates/config/conflogin.php:64
-#: ../templates/config/mainlogin.php:75
-#: ../templates/selfService/selfServiceLogin.php:240
-#: ../templates/selfService/selfServiceLogin.php:379
+#: ../templates/login.php:454 ../templates/config/conflogin.php:64
+#: ../templates/config/mainlogin.php:76
+#: ../templates/selfService/selfServiceLogin.php:256
+#: ../templates/selfService/selfServiceLogin.php:394
 #: ../templates/selfService/adminLogin.php:65
-#: ../templates/3rdParty/pla/lib/HTMLTree.php:530 ../help/help.inc:56
+#: ../templates/selfService/selfService2Factor.php:129
+#: ../templates/3rdParty/pla/lib/HTMLTree.php:530
+#: ../templates/login2Factor.php:127 ../help/help.inc:56
 msgid "Login"
 msgstr "Login"
 
-#: ../templates/selfService/adminMain.php:490 ../help/help.inc:262
+#: ../templates/selfService/adminMain.php:543 ../help/help.inc:262
 msgid "Login attribute label"
 msgstr "Login attribute label"
 
-#: ../templates/selfService/adminMain.php:499 ../help/help.inc:264
+#: ../templates/selfService/adminMain.php:552 ../help/help.inc:264
 msgid "Login caption"
 msgstr "Login caption"
 
-#: ../templates/config/confmain.php:494 ../help/help.inc:122
+#: ../templates/config/confmain.php:497 ../help/help.inc:122
 msgid "Login method"
 msgstr "Login method"
 
 #: ../lib/types/user.inc:102 ../lib/modules/posixAccount.inc:189
 #: ../lib/modules/posixAccount.inc:265 ../lib/modules/posixAccount.inc:358
 #: ../lib/modules/posixAccount.inc:485 ../lib/modules/posixAccount.inc:1477
-#: ../lib/modules/posixAccount.inc:1749 ../lib/modules/posixAccount.inc:1852
-#: ../lib/modules/posixAccount.inc:2779
+#: ../lib/modules/posixAccount.inc:1749 ../lib/modules/posixAccount.inc:1850
+#: ../lib/modules/posixAccount.inc:2777
 msgid "Login shell"
 msgstr "Login shell"
 
 #: ../lib/modules/posixAccount.inc:199 ../lib/modules/posixAccount.inc:435
-#: ../lib/modules/posixAccount.inc:1968
+#: ../lib/modules/posixAccount.inc:1966
 msgid "Login shells"
 msgstr "Login shells"
 
-#: ../templates/pdfedit/pdfpage.php:457
+#: ../templates/pdfedit/pdfpage.php:472
 msgid "Logo"
 msgstr "Logo"
 
-#: ../lib/pdfstruct.inc:300
+#: ../lib/pdfstruct.inc:312
 msgid "Logo file deleted."
 msgstr "Logo file deleted."
 
-#: ../lib/pdfstruct.inc:292
+#: ../lib/pdfstruct.inc:304
 #, php-format
 msgid "Logo is still in use by PDF structure \"%s\" in account type \"%s\"."
 msgstr "Logo is still in use by PDF structure \"%s\" in account type \"%s\"."
 
 #: ../lib/modules/sambaDomain.inc:109 ../lib/modules/sambaDomain.inc:192
-#: ../lib/modules/sambaDomain.inc:290 ../lib/modules/sambaDomain.inc:617
+#: ../lib/modules/sambaDomain.inc:290 ../lib/modules/sambaDomain.inc:615
 msgid "Logon for password change"
 msgstr "Logon for password change"
 
@@ -7366,10 +7407,10 @@ msgstr "Logon hours"
 #: ../lib/modules/sambaSamAccount.inc:1189
 #: ../lib/modules/sambaSamAccount.inc:1710
 #: ../lib/modules/sambaSamAccount.inc:1892
-#: ../lib/modules/sambaSamAccount.inc:1917 ../lib/modules/windowsUser.inc:226
+#: ../lib/modules/sambaSamAccount.inc:1915 ../lib/modules/windowsUser.inc:226
 #: ../lib/modules/windowsUser.inc:564 ../lib/modules/windowsUser.inc:745
 #: ../lib/modules/windowsUser.inc:838 ../lib/modules/windowsUser.inc:984
-#: ../lib/modules/windowsUser.inc:1220 ../lib/modules/windowsUser.inc:2485
+#: ../lib/modules/windowsUser.inc:1220 ../lib/modules/windowsUser.inc:2483
 msgid "Logon script"
 msgstr "Logon script"
 
@@ -7379,9 +7420,9 @@ msgstr "Logon script"
 msgid "Logon script is invalid!"
 msgstr "Logon script is invalid!"
 
-#: ../templates/selfService/selfServiceMain.php:66
-#: ../templates/selfService/selfServiceMain.php:476
-#: ../templates/main_header.php:135
+#: ../templates/selfService/selfServiceMain.php:70
+#: ../templates/selfService/selfServiceMain.php:485
+#: ../templates/main_header.php:133
 msgid "Logout"
 msgstr "Logout"
 
@@ -7391,8 +7432,8 @@ msgstr "M-Node (0x04)"
 
 #: ../lib/types/dhcp.inc:96 ../lib/modules/ieee802device.inc:58
 #: ../lib/modules/ieee802device.inc:68 ../lib/modules/ieee802device.inc:79
-#: ../lib/modules/ieee802device.inc:106 ../lib/modules/fixed_ip.inc:102
-#: ../lib/modules/fixed_ip.inc:429 ../lib/modules/fixed_ip.inc:743
+#: ../lib/modules/ieee802device.inc:106 ../lib/modules/fixed_ip.inc:105
+#: ../lib/modules/fixed_ip.inc:432 ../lib/modules/fixed_ip.inc:744
 msgid "MAC address"
 msgstr "MAC address"
 
@@ -7400,7 +7441,7 @@ msgstr "MAC address"
 msgid "MAC address list"
 msgstr "MAC address list"
 
-#: ../lib/modules/ieee802device.inc:86 ../lib/modules/ieee802device.inc:165
+#: ../lib/modules/ieee802device.inc:86 ../lib/modules/ieee802device.inc:163
 msgid "MAC addresses"
 msgstr "MAC addresses"
 
@@ -7408,21 +7449,21 @@ msgstr "MAC addresses"
 msgid "MIT Kerberos password change command"
 msgstr "MIT Kerberos password change command"
 
-#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:281
-#: ../lib/modules/bindDLZ.inc:287 ../lib/modules/bindDLZ.inc:294
-#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:502
+#: ../lib/modules/bindDLZ.inc:113 ../lib/modules/bindDLZ.inc:284
+#: ../lib/modules/bindDLZ.inc:290 ../lib/modules/bindDLZ.inc:297
+#: ../lib/modules/bindDLZ.inc:486 ../lib/modules/bindDLZ.inc:505
 msgid "MX record"
 msgstr "MX record"
 
-#: ../lib/modules/bindDLZ.inc:421 ../lib/modules/bindDLZ.inc:440
-#: ../lib/modules/bindDLZ.inc:1515
+#: ../lib/modules/bindDLZ.inc:424 ../lib/modules/bindDLZ.inc:443
+#: ../lib/modules/bindDLZ.inc:1516
 msgid "MX records"
 msgstr "MX records"
 
 #: ../lib/modules/posixGroup.inc:546 ../lib/modules/posixGroup.inc:570
 #: ../lib/modules/posixGroup.inc:599 ../lib/modules/posixAccount.inc:452
-#: ../lib/modules/posixAccount.inc:1891 ../lib/modules/posixAccount.inc:1920
-#: ../lib/modules/posixAccount.inc:1957
+#: ../lib/modules/posixAccount.inc:1889 ../lib/modules/posixAccount.inc:1918
+#: ../lib/modules/posixAccount.inc:1955
 msgid "Magic number"
 msgstr "Magic number"
 
@@ -7449,30 +7490,30 @@ msgstr "Mail routing"
 
 #: ../lib/modules/selfRegistration.inc:721
 #: ../lib/modules/selfRegistration.inc:741
-#: ../lib/modules/passwordSelfReset.inc:1792
-#: ../lib/modules/passwordSelfReset.inc:1807
-#: ../lib/modules/passwordSelfReset.inc:1840
+#: ../lib/modules/passwordSelfReset.inc:1790
+#: ../lib/modules/passwordSelfReset.inc:1805
+#: ../lib/modules/passwordSelfReset.inc:1838
 msgid "Mail sending failed."
 msgstr "Mail sending failed."
 
-#: ../lib/modules/bindDLZ.inc:139 ../lib/modules/bindDLZ.inc:143
-#: ../lib/modules/bindDLZ.inc:281 ../lib/modules/bindDLZ.inc:500
-#: ../lib/modules/bindDLZ.inc:917 ../lib/modules/bindDLZ.inc:1517
-#: ../lib/modules/kolabUser.inc:98 ../lib/modules/kolabSharedFolder.inc:98
+#: ../lib/modules/bindDLZ.inc:142 ../lib/modules/bindDLZ.inc:146
+#: ../lib/modules/bindDLZ.inc:284 ../lib/modules/bindDLZ.inc:503
+#: ../lib/modules/bindDLZ.inc:920 ../lib/modules/bindDLZ.inc:1518
+#: ../lib/modules/kolabUser.inc:101 ../lib/modules/kolabSharedFolder.inc:98
 #: ../lib/modules/inetLocalMailRecipient.inc:91
 #: ../lib/modules/inetLocalMailRecipient.inc:97
 #: ../lib/modules/inetLocalMailRecipient.inc:124
 #: ../lib/modules/inetLocalMailRecipient.inc:133
 #: ../lib/modules/inetLocalMailRecipient.inc:177
-#: ../lib/modules/inetLocalMailRecipient.inc:356
+#: ../lib/modules/inetLocalMailRecipient.inc:354
 msgid "Mail server"
 msgstr "Mail server"
 
-#: ../lib/modules/bindDLZ.inc:914
+#: ../lib/modules/bindDLZ.inc:917
 msgid "Mail servers (\"MX\" records)"
 msgstr "Mail servers (\"MX\" records)"
 
-#: ../lib/account.inc:1129
+#: ../lib/account.inc:1135
 #, php-format
 msgid "Mail successfully sent to %s."
 msgstr "Mail successfully sent to %s."
@@ -7481,13 +7522,13 @@ msgstr "Mail successfully sent to %s."
 #: ../lib/modules/asteriskAccount.inc:278
 #: ../lib/modules/asteriskAccount.inc:399
 #: ../lib/modules/asteriskAccount.inc:657
-#: ../lib/modules/asteriskAccount.inc:997
-#: ../lib/modules/asteriskAccount.inc:1260
+#: ../lib/modules/asteriskAccount.inc:995
+#: ../lib/modules/asteriskAccount.inc:1258
 #: ../lib/modules/asteriskVoicemail.inc:95
 #: ../lib/modules/asteriskVoicemail.inc:138
 #: ../lib/modules/asteriskVoicemail.inc:158
 #: ../lib/modules/asteriskVoicemail.inc:245
-#: ../lib/modules/asteriskVoicemail.inc:372 ../lib/modules/imapAccess.inc:68
+#: ../lib/modules/asteriskVoicemail.inc:370 ../lib/modules/imapAccess.inc:68
 #: ../lib/modules/imapAccess.inc:111 ../lib/modules/imapAccess.inc:242
 msgid "Mailbox"
 msgstr "Mailbox"
@@ -7500,32 +7541,32 @@ msgstr "Mailbox already exists on IMAP server."
 msgid "Mailbox does not exist on IMAP server."
 msgstr "Mailbox does not exist on IMAP server."
 
-#: ../lib/modules/kolabUser.inc:148 ../lib/modules/kolabUser.inc:192
-#: ../lib/modules/kolabUser.inc:231 ../lib/modules/kolabUser.inc:297
-#: ../lib/modules/kolabUser.inc:300 ../lib/modules/kolabUser.inc:706
+#: ../lib/modules/kolabUser.inc:151 ../lib/modules/kolabUser.inc:195
+#: ../lib/modules/kolabUser.inc:234 ../lib/modules/kolabUser.inc:300
+#: ../lib/modules/kolabUser.inc:303 ../lib/modules/kolabUser.inc:707
 #: ../lib/modules/kolabSharedFolder.inc:154
 #: ../lib/modules/kolabSharedFolder.inc:188
 #: ../lib/modules/kolabSharedFolder.inc:238
 #: ../lib/modules/kolabSharedFolder.inc:284
 #: ../lib/modules/kolabSharedFolder.inc:287
-#: ../lib/modules/kolabSharedFolder.inc:522
+#: ../lib/modules/kolabSharedFolder.inc:520
 msgid "Mailbox home server"
 msgstr "Mailbox home server"
 
-#: ../lib/modules/kolabUser.inc:251
+#: ../lib/modules/kolabUser.inc:254
 msgid "Mailbox home server name is empty!"
 msgstr "Mailbox home server name is empty!"
 
-#: ../lib/modules/kolabUser.inc:249 ../lib/modules/kolabUser.inc:250
+#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabUser.inc:253
 #: ../lib/modules/kolabSharedFolder.inc:257
 #: ../lib/modules/kolabSharedFolder.inc:258
 msgid "Mailbox home server name is invalid!"
 msgstr "Mailbox home server name is invalid!"
 
-#: ../lib/modules/kolabUser.inc:99 ../lib/modules/kolabUser.inc:174
-#: ../lib/modules/kolabUser.inc:199 ../lib/modules/kolabUser.inc:232
-#: ../lib/modules/kolabUser.inc:257 ../lib/modules/kolabUser.inc:310
-#: ../lib/modules/kolabUser.inc:739
+#: ../lib/modules/kolabUser.inc:102 ../lib/modules/kolabUser.inc:177
+#: ../lib/modules/kolabUser.inc:202 ../lib/modules/kolabUser.inc:235
+#: ../lib/modules/kolabUser.inc:260 ../lib/modules/kolabUser.inc:313
+#: ../lib/modules/kolabUser.inc:740
 msgid "Mailbox quota"
 msgstr "Mailbox quota"
 
@@ -7537,11 +7578,11 @@ msgstr "Mailing aliases (e.g. NIS mail aliases)"
 msgid "Mails to this name are forwarded to the recipients."
 msgstr "Mails to this name are forwarded to the recipients."
 
-#: ../templates/pdfedit/pdfpage.php:371 ../templates/pdfedit/pdfpage.php:683
+#: ../templates/pdfedit/pdfpage.php:386 ../templates/pdfedit/pdfpage.php:702
 msgid "Main"
 msgstr "Main"
 
-#: ../templates/selfService/adminMain.php:505 ../help/help.inc:266
+#: ../templates/selfService/adminMain.php:558 ../help/help.inc:266
 msgid "Main page caption"
 msgstr "Main page caption"
 
@@ -7549,23 +7590,23 @@ msgstr "Main page caption"
 msgid "Make sure your filter (above) will select all child records."
 msgstr "Make sure your filter (above) will select all child records."
 
-#: ../lib/modules/inetOrgPerson.inc:1605
+#: ../lib/modules/inetOrgPerson.inc:1603
 msgid "Manage"
 msgstr "Manage"
 
-#: ../templates/pdfedit/pdfmain.php:195
+#: ../templates/pdfedit/pdfmain.php:240
 msgid "Manage existing PDF structures"
 msgstr "Manage existing PDF structures"
 
-#: ../templates/profedit/profilemain.php:180
+#: ../templates/profedit/profilemain.php:223
 msgid "Manage existing profiles"
 msgstr "Manage existing profiles"
 
-#: ../templates/pdfedit/pdfmain.php:237
+#: ../templates/pdfedit/pdfmain.php:282
 msgid "Manage logos"
 msgstr "Manage logos"
 
-#: ../lib/modules/kolabUser.inc:112 ../lib/modules/kolabUser.inc:170
+#: ../lib/modules/kolabUser.inc:115 ../lib/modules/kolabUser.inc:173
 msgid "Manage object class \"mailrecipient\""
 msgstr "Manage object class \"mailrecipient\""
 
@@ -7583,39 +7624,39 @@ msgstr "Manage server profiles"
 
 #: ../lib/modules/windowsHost.inc:86 ../lib/modules/windowsHost.inc:112
 #: ../lib/modules/windowsHost.inc:122 ../lib/modules/windowsHost.inc:146
-#: ../lib/modules/windowsHost.inc:298 ../lib/modules/windowsGroup.inc:152
-#: ../lib/modules/windowsGroup.inc:173 ../lib/modules/windowsGroup.inc:233
-#: ../lib/modules/windowsGroup.inc:275 ../lib/modules/windowsGroup.inc:359
-#: ../lib/modules/windowsGroup.inc:947
+#: ../lib/modules/windowsHost.inc:296 ../lib/modules/windowsGroup.inc:155
+#: ../lib/modules/windowsGroup.inc:176 ../lib/modules/windowsGroup.inc:236
+#: ../lib/modules/windowsGroup.inc:278 ../lib/modules/windowsGroup.inc:362
+#: ../lib/modules/windowsGroup.inc:948
 msgid "Managed by"
 msgstr "Managed by"
 
-#: ../templates/serverInfo.php:105
+#: ../templates/serverInfo.php:106
 msgid "Managed suffixes"
 msgstr "Managed suffixes"
 
 #: ../lib/types/user.inc:104 ../lib/modules/ipHost.inc:77
 #: ../lib/modules/ipHost.inc:103 ../lib/modules/ipHost.inc:114
-#: ../lib/modules/ipHost.inc:164 ../lib/modules/ipHost.inc:305
+#: ../lib/modules/ipHost.inc:164 ../lib/modules/ipHost.inc:303
 #: ../lib/modules/windowsUser.inc:346 ../lib/modules/windowsUser.inc:734
 #: ../lib/modules/windowsUser.inc:892 ../lib/modules/windowsUser.inc:1156
-#: ../lib/modules/windowsUser.inc:2462 ../lib/modules/windowsUser.inc:3230
-#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/inetOrgPerson.inc:625
-#: ../lib/modules/inetOrgPerson.inc:676 ../lib/modules/inetOrgPerson.inc:680
-#: ../lib/modules/inetOrgPerson.inc:1617 ../lib/modules/inetOrgPerson.inc:1986
-#: ../lib/modules/inetOrgPerson.inc:3684 ../lib/modules/inetOrgPerson.inc:3726
+#: ../lib/modules/windowsUser.inc:2460 ../lib/modules/windowsUser.inc:3228
+#: ../lib/modules/inetOrgPerson.inc:368 ../lib/modules/inetOrgPerson.inc:623
+#: ../lib/modules/inetOrgPerson.inc:674 ../lib/modules/inetOrgPerson.inc:678
+#: ../lib/modules/inetOrgPerson.inc:1615 ../lib/modules/inetOrgPerson.inc:1982
+#: ../lib/modules/inetOrgPerson.inc:3664 ../lib/modules/inetOrgPerson.inc:3706
 msgid "Manager"
 msgstr "Manager"
 
-#: ../lib/tools/ouEditor.inc:53
+#: ../lib/tools/ouEditor.inc:54
 msgid "Manages OU objects in your LDAP tree."
 msgstr "Manages OU objects in your LDAP tree."
 
-#: ../lib/modules/kolabUser.inc:52
+#: ../lib/modules/kolabUser.inc:55
 msgid "Manual"
 msgstr "Manual"
 
-#: ../lib/modules/kolabUser.inc:54
+#: ../lib/modules/kolabUser.inc:57
 msgid "Manual if conflicts"
 msgstr "Manual if conflicts"
 
@@ -7626,7 +7667,7 @@ msgstr "Manual scripts"
 #: ../lib/types/nisObjectType.inc:78 ../lib/modules/nisObject.inc:65
 #: ../lib/modules/nisObject.inc:96 ../lib/modules/nisObject.inc:112
 #: ../lib/modules/nisObject.inc:123 ../lib/modules/nisObject.inc:149
-#: ../lib/modules/nisObject.inc:213
+#: ../lib/modules/nisObject.inc:211
 msgid "Mapping entry"
 msgstr "Mapping entry"
 
@@ -7638,18 +7679,18 @@ msgstr ""
 
 #: ../lib/types/nisObjectType.inc:79 ../lib/modules/nisObject.inc:69
 #: ../lib/modules/nisObject.inc:89 ../lib/modules/nisObject.inc:113
-#: ../lib/modules/nisObject.inc:143 ../lib/modules/nisObject.inc:214
+#: ../lib/modules/nisObject.inc:143 ../lib/modules/nisObject.inc:212
 msgid "Mapping name"
 msgstr "Mapping name"
 
 #: ../lib/modules/kolabGroup.inc:213 ../lib/modules/kolabGroup.inc:293
-#: ../lib/modules/kolabUser.inc:388 ../lib/modules/kolabUser.inc:519
+#: ../lib/modules/kolabUser.inc:391 ../lib/modules/kolabUser.inc:522
 #: ../lib/modules/kolabSharedFolder.inc:345
 #: ../lib/modules/kolabSharedFolder.inc:433
 msgid "Mark account for deletion"
 msgstr "Mark account for deletion"
 
-#: ../lib/modules/kolabGroup.inc:113 ../lib/modules/kolabUser.inc:178
+#: ../lib/modules/kolabGroup.inc:113 ../lib/modules/kolabUser.inc:181
 #: ../lib/modules/kolabSharedFolder.inc:166
 msgid "Mark for deletion"
 msgstr "Mark for deletion"
@@ -7659,19 +7700,19 @@ msgid "Mass delete"
 msgstr "Mass delete"
 
 #: ../templates/config/profmanage.php:317
-#: ../templates/config/mainlogin.php:164
+#: ../templates/config/mainlogin.php:169
 #: ../templates/selfService/profManage.php:250
-#: ../templates/pdfedit/pdfmain.php:295 ../templates/pdfedit/pdfmain.php:343
-#: ../templates/profedit/profilemain.php:262
-#: ../templates/profedit/profilemain.php:311 ../help/help.inc:144
+#: ../templates/pdfedit/pdfmain.php:347 ../templates/pdfedit/pdfmain.php:390
+#: ../templates/profedit/profilemain.php:308
+#: ../templates/profedit/profilemain.php:351 ../help/help.inc:144
 msgid "Master password"
 msgstr "Master password"
 
 #: ../templates/config/profmanage.php:54
 #: ../templates/selfService/profManage.php:40
-#: ../templates/pdfedit/pdfmain.php:110 ../templates/pdfedit/pdfmain.php:118
-#: ../templates/profedit/profilemain.php:126
-#: ../templates/profedit/profilemain.php:134
+#: ../templates/pdfedit/pdfmain.php:134 ../templates/pdfedit/pdfmain.php:157
+#: ../templates/profedit/profilemain.php:150
+#: ../templates/profedit/profilemain.php:171
 msgid "Master password is wrong!"
 msgstr "Master password is wrong!"
 
@@ -7679,34 +7720,34 @@ msgstr "Master password is wrong!"
 msgid "Master passwords are different or empty!"
 msgstr "Master passwords are different or empty!"
 
-#: ../templates/schema/schema.php:268
+#: ../templates/schema/schema.php:269
 msgid "Matching rule OID"
 msgstr "Matching rule OID"
 
-#: ../templates/schema/schema.php:77 ../templates/schema/schema.php:78
+#: ../templates/schema/schema.php:78 ../templates/schema/schema.php:79
 msgid "Matching rules"
 msgstr "Matching rules"
 
-#: ../templates/serverInfo.php:173
+#: ../templates/serverInfo.php:174
 msgid "Max. file descriptors"
 msgstr "Max. file descriptors"
 
-#: ../lib/modules/posixGroup.inc:590 ../lib/modules/posixGroup.inc:664
-#: ../lib/modules/posixGroup.inc:665
+#: ../lib/modules/posixGroup.inc:590 ../lib/modules/posixGroup.inc:662
+#: ../lib/modules/posixGroup.inc:663
 msgid "Maximum GID number"
 msgstr "Maximum GID number"
 
-#: ../lib/modules/posixGroup.inc:664
+#: ../lib/modules/posixGroup.inc:662
 msgid "Maximum GID number is invalid or empty!"
 msgstr "Maximum GID number is invalid or empty!"
 
-#: ../lib/modules/posixGroup.inc:665
+#: ../lib/modules/posixGroup.inc:663
 msgid "Maximum GID number must be greater than minimum GID number!"
 msgstr "Maximum GID number must be greater than minimum GID number!"
 
 #: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:96
 #: ../lib/modules/posixAccount.inc:97 ../lib/modules/posixAccount.inc:98
-#: ../lib/modules/posixAccount.inc:1917 ../lib/modules/posixAccount.inc:1954
+#: ../lib/modules/posixAccount.inc:1915 ../lib/modules/posixAccount.inc:1952
 msgid "Maximum UID number"
 msgstr "Maximum UID number"
 
@@ -7720,48 +7761,48 @@ msgstr "Maximum UID number must be greater than minimum UID number!"
 
 #: ../lib/types/ppolicyType.inc:84 ../lib/modules/ppolicy.inc:108
 #: ../lib/modules/ppolicy.inc:152 ../lib/modules/ppolicy.inc:172
-#: ../lib/modules/ppolicy.inc:268 ../lib/modules/ppolicy.inc:478
+#: ../lib/modules/ppolicy.inc:268 ../lib/modules/ppolicy.inc:476
 msgid "Maximum failure count"
 msgstr "Maximum failure count"
 
 #: ../templates/3rdParty/pla/htdocs/add_attr_form.php:128
 #: ../templates/3rdParty/pla/htdocs/import_form.php:36
-#: ../lib/modules/customFields.inc:160 ../lib/modules/customFields.inc:3512
+#: ../lib/modules/customFields.inc:160 ../lib/modules/customFields.inc:3510
 msgid "Maximum file size"
 msgstr "Maximum file size"
 
-#: ../lib/modules/windowsUser.inc:3240 ../lib/modules/inetOrgPerson.inc:2449
-#: ../lib/modules/inetOrgPerson.inc:2474 ../lib/modules/inetOrgPerson.inc:3755
+#: ../lib/modules/windowsUser.inc:3238 ../lib/modules/inetOrgPerson.inc:2445
+#: ../lib/modules/inetOrgPerson.inc:2470 ../lib/modules/inetOrgPerson.inc:3735
 msgid "Maximum file size (kB)"
 msgstr "Maximum file size (kB)"
 
-#: ../lib/modules/customFields.inc:3544
+#: ../lib/modules/customFields.inc:3542
 msgid "Maximum file size must be a number. Please enter 0 for no limit."
 msgstr "Maximum file size must be a number. Please enter 0 for no limit."
 
-#: ../lib/modules/windowsUser.inc:3238 ../lib/modules/inetOrgPerson.inc:2446
-#: ../lib/modules/inetOrgPerson.inc:2471 ../lib/modules/inetOrgPerson.inc:3753
+#: ../lib/modules/windowsUser.inc:3236 ../lib/modules/inetOrgPerson.inc:2442
+#: ../lib/modules/inetOrgPerson.inc:2467 ../lib/modules/inetOrgPerson.inc:3733
 msgid "Maximum height (px)"
 msgstr "Maximum height (px)"
 
 #: ../lib/types/pykotaPrinterType.inc:95 ../lib/modules/pykotaPrinter.inc:103
 #: ../lib/modules/pykotaPrinter.inc:135 ../lib/modules/pykotaPrinter.inc:159
 #: ../lib/modules/pykotaPrinter.inc:195 ../lib/modules/pykotaPrinter.inc:213
-#: ../lib/modules/pykotaPrinter.inc:233 ../lib/modules/pykotaPrinter.inc:589
+#: ../lib/modules/pykotaPrinter.inc:233 ../lib/modules/pykotaPrinter.inc:587
 msgid "Maximum job size"
 msgstr "Maximum job size"
 
 #: ../lib/modules/dhcp_settings.inc:162 ../lib/modules/dhcp_settings.inc:215
 #: ../lib/modules/dhcp_settings.inc:230 ../lib/modules/dhcp_settings.inc:267
-#: ../lib/modules/dhcp_settings.inc:575 ../lib/modules/dhcp_settings.inc:679
+#: ../lib/modules/dhcp_settings.inc:575 ../lib/modules/dhcp_settings.inc:677
 msgid "Maximum lease time"
 msgstr "Maximum lease time"
 
-#: ../templates/schema/schema.php:214
+#: ../templates/schema/schema.php:215
 msgid "Maximum length"
 msgstr "Maximum length"
 
-#: ../lib/lists.inc:1031 ../help/help.inc:97
+#: ../lib/lists.inc:1017 ../help/help.inc:97
 msgid "Maximum list entries"
 msgstr "Maximum list entries"
 
@@ -7775,101 +7816,101 @@ msgstr ""
 #: ../lib/modules/shadowAccount.inc:65 ../lib/modules/shadowAccount.inc:123
 #: ../lib/modules/shadowAccount.inc:172 ../lib/modules/shadowAccount.inc:189
 #: ../lib/modules/shadowAccount.inc:227 ../lib/modules/shadowAccount.inc:340
-#: ../lib/modules/shadowAccount.inc:573 ../lib/modules/ppolicy.inc:88
+#: ../lib/modules/shadowAccount.inc:571 ../lib/modules/ppolicy.inc:88
 #: ../lib/modules/ppolicy.inc:144 ../lib/modules/ppolicy.inc:167
 #: ../lib/modules/ppolicy.inc:168 ../lib/modules/ppolicy.inc:205
-#: ../lib/modules/ppolicy.inc:474 ../lib/modules/sambaDomain.inc:129
+#: ../lib/modules/ppolicy.inc:472 ../lib/modules/sambaDomain.inc:129
 #: ../lib/modules/sambaDomain.inc:197 ../lib/modules/sambaDomain.inc:220
 #: ../lib/modules/sambaDomain.inc:222 ../lib/modules/sambaDomain.inc:332
-#: ../lib/modules/sambaDomain.inc:610
+#: ../lib/modules/sambaDomain.inc:608
 msgid "Maximum password age"
 msgstr "Maximum password age"
 
-#: ../lib/modules/windowsUser.inc:3237 ../lib/modules/inetOrgPerson.inc:2444
-#: ../lib/modules/inetOrgPerson.inc:2468 ../lib/modules/inetOrgPerson.inc:3752
+#: ../lib/modules/windowsUser.inc:3235 ../lib/modules/inetOrgPerson.inc:2440
+#: ../lib/modules/inetOrgPerson.inc:2464 ../lib/modules/inetOrgPerson.inc:3732
 msgid "Maximum width (px)"
 msgstr "Maximum width (px)"
 
 #: ../lib/modules/qmailGroup.inc:80 ../lib/modules/qmailGroup.inc:204
 #: ../lib/modules/qmailGroup.inc:208 ../lib/modules/qmailGroup.inc:337
 #: ../lib/modules/qmailGroup.inc:402 ../lib/modules/qmailGroup.inc:425
-#: ../lib/modules/qmailGroup.inc:514 ../lib/modules/qmailGroup.inc:1013
+#: ../lib/modules/qmailGroup.inc:514 ../lib/modules/qmailGroup.inc:1011
 msgid "Member email addresses"
 msgstr "Member email addresses"
 
 #: ../lib/modules/qmailGroup.inc:78 ../lib/modules/qmailGroup.inc:156
 #: ../lib/modules/qmailGroup.inc:160 ../lib/modules/qmailGroup.inc:279
 #: ../lib/modules/qmailGroup.inc:381 ../lib/modules/qmailGroup.inc:516
-#: ../lib/modules/qmailGroup.inc:783 ../lib/modules/qmailGroup.inc:1012
+#: ../lib/modules/qmailGroup.inc:783 ../lib/modules/qmailGroup.inc:1010
 msgid "Member entries"
 msgstr "Member entries"
 
 #: ../lib/modules/qmailGroup.inc:82 ../lib/modules/qmailGroup.inc:180
 #: ../lib/modules/qmailGroup.inc:184 ../lib/modules/qmailGroup.inc:303
 #: ../lib/modules/qmailGroup.inc:390 ../lib/modules/qmailGroup.inc:515
-#: ../lib/modules/qmailGroup.inc:1014
+#: ../lib/modules/qmailGroup.inc:1012
 msgid "Member filter"
 msgstr "Member filter"
 
-#: ../lib/modules/windowsGroup.inc:136 ../lib/modules/windowsGroup.inc:267
-#: ../lib/modules/windowsGroup.inc:416 ../lib/modules/windowsGroup.inc:971
+#: ../lib/modules/windowsGroup.inc:139 ../lib/modules/windowsGroup.inc:270
+#: ../lib/modules/windowsGroup.inc:419 ../lib/modules/windowsGroup.inc:972
 msgid "Member of"
 msgstr "Member of"
 
-#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:95
-#: ../lib/modules/nisnetgroup.inc:99 ../lib/modules/nisnetgroup.inc:132
-#: ../lib/modules/nisnetgroup.inc:142 ../lib/modules/nisnetgroup.inc:286
-#: ../lib/modules/nisnetgroup.inc:583 ../lib/modules/organizationalRole.inc:93
-#: ../lib/modules/organizationalRole.inc:97
-#: ../lib/modules/organizationalRole.inc:130
-#: ../lib/modules/organizationalRole.inc:138
-#: ../lib/modules/organizationalRole.inc:193
-#: ../lib/modules/organizationalRole.inc:347
-#: ../lib/modules/organizationalRole.inc:514
-#: ../lib/modules/windowsGroup.inc:132 ../lib/modules/windowsGroup.inc:140
-#: ../lib/modules/windowsGroup.inc:217 ../lib/modules/windowsGroup.inc:266
-#: ../lib/modules/windowsGroup.inc:956 ../lib/modules/groupOfNames.inc:101
-#: ../lib/modules/groupOfNames.inc:105 ../lib/modules/groupOfNames.inc:151
-#: ../lib/modules/groupOfNames.inc:159 ../lib/modules/groupOfNames.inc:168
-#: ../lib/modules/groupOfNames.inc:249 ../lib/modules/groupOfNames.inc:561
-#: ../lib/modules/groupOfNames.inc:772
+#: ../lib/types/netgroup.inc:94 ../lib/modules/nisnetgroup.inc:98
+#: ../lib/modules/nisnetgroup.inc:102 ../lib/modules/nisnetgroup.inc:135
+#: ../lib/modules/nisnetgroup.inc:145 ../lib/modules/nisnetgroup.inc:289
+#: ../lib/modules/nisnetgroup.inc:584 ../lib/modules/organizationalRole.inc:96
+#: ../lib/modules/organizationalRole.inc:100
+#: ../lib/modules/organizationalRole.inc:133
+#: ../lib/modules/organizationalRole.inc:141
+#: ../lib/modules/organizationalRole.inc:196
+#: ../lib/modules/organizationalRole.inc:350
+#: ../lib/modules/organizationalRole.inc:515
+#: ../lib/modules/windowsGroup.inc:135 ../lib/modules/windowsGroup.inc:143
+#: ../lib/modules/windowsGroup.inc:220 ../lib/modules/windowsGroup.inc:269
+#: ../lib/modules/windowsGroup.inc:957 ../lib/modules/groupOfNames.inc:104
+#: ../lib/modules/groupOfNames.inc:108 ../lib/modules/groupOfNames.inc:154
+#: ../lib/modules/groupOfNames.inc:162 ../lib/modules/groupOfNames.inc:171
+#: ../lib/modules/groupOfNames.inc:252 ../lib/modules/groupOfNames.inc:564
+#: ../lib/modules/groupOfNames.inc:773
 msgid "Members"
 msgstr "Members"
 
-#: ../lib/modules/groupOfNames.inc:109 ../lib/modules/groupOfNames.inc:180
+#: ../lib/modules/groupOfNames.inc:112 ../lib/modules/groupOfNames.inc:183
 msgid "Members are optional"
 msgstr "Members are optional"
 
 #: ../lib/modules/qmailGroup.inc:94 ../lib/modules/qmailGroup.inc:196
 #: ../lib/modules/qmailGroup.inc:319 ../lib/modules/qmailGroup.inc:396
-#: ../lib/modules/qmailGroup.inc:617 ../lib/modules/qmailGroup.inc:1025
+#: ../lib/modules/qmailGroup.inc:617 ../lib/modules/qmailGroup.inc:1023
 msgid "Members only"
 msgstr "Members only"
 
-#: ../lib/modules/nisNetGroupHost.inc:64 ../lib/modules/nisNetGroupUser.inc:83
+#: ../lib/modules/nisNetGroupHost.inc:67 ../lib/modules/nisNetGroupUser.inc:86
 msgid "Memberships"
 msgstr "Memberships"
 
 #: ../lib/modules/qmailUser.inc:108 ../lib/modules/qmailUser.inc:143
 #: ../lib/modules/qmailUser.inc:223 ../lib/modules/qmailUser.inc:316
 #: ../lib/modules/qmailUser.inc:412 ../lib/modules/qmailUser.inc:696
-#: ../lib/modules/qmailUser.inc:1116
+#: ../lib/modules/qmailUser.inc:1114
 msgid "Message count limit"
 msgstr "Message count limit"
 
 #: ../lib/modules/qmailUser.inc:110 ../lib/modules/qmailUser.inc:153
 #: ../lib/modules/qmailUser.inc:227 ../lib/modules/qmailUser.inc:324
 #: ../lib/modules/qmailUser.inc:415 ../lib/modules/qmailUser.inc:707
-#: ../lib/modules/qmailUser.inc:1117
+#: ../lib/modules/qmailUser.inc:1115
 msgid "Message size limit"
 msgstr "Message size limit"
 
 #: ../lib/modules/qmailUser.inc:120 ../lib/modules/qmailUser.inc:171
 #: ../lib/modules/qmailUser.inc:247 ../lib/modules/qmailUser.inc:366
 #: ../lib/modules/qmailUser.inc:430 ../lib/modules/qmailUser.inc:611
-#: ../lib/modules/qmailUser.inc:1120 ../lib/modules/qmailGroup.inc:139
+#: ../lib/modules/qmailUser.inc:1118 ../lib/modules/qmailGroup.inc:139
 #: ../lib/modules/qmailGroup.inc:254 ../lib/modules/qmailGroup.inc:372
-#: ../lib/modules/qmailGroup.inc:508 ../lib/modules/qmailGroup.inc:1008
+#: ../lib/modules/qmailGroup.inc:508 ../lib/modules/qmailGroup.inc:1006
 msgid "Message store"
 msgstr "Message store"
 
@@ -7877,25 +7918,25 @@ msgstr "Message store"
 msgid "Messages"
 msgstr "Messages"
 
-#: ../lib/modules/windowsUser.inc:420 ../lib/modules/inetOrgPerson.inc:323
+#: ../lib/modules/windowsUser.inc:420 ../lib/modules/inetOrgPerson.inc:321
 msgid "Miller"
 msgstr "Miller"
 
 #: ../lib/modules/sambaDomain.inc:101 ../lib/modules/sambaDomain.inc:190
-#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:606
+#: ../lib/modules/sambaDomain.inc:276 ../lib/modules/sambaDomain.inc:604
 msgid "Minimal password length"
 msgstr "Minimal password length"
 
-#: ../lib/modules/posixGroup.inc:587 ../lib/modules/posixGroup.inc:663
+#: ../lib/modules/posixGroup.inc:587 ../lib/modules/posixGroup.inc:661
 msgid "Minimum GID number"
 msgstr "Minimum GID number"
 
-#: ../lib/modules/posixGroup.inc:663
+#: ../lib/modules/posixGroup.inc:661
 msgid "Minimum GID number is invalid or empty!"
 msgstr "Minimum GID number is invalid or empty!"
 
 #: ../lib/modules/posixAccount.inc:93 ../lib/modules/posixAccount.inc:95
-#: ../lib/modules/posixAccount.inc:1914 ../lib/modules/posixAccount.inc:1951
+#: ../lib/modules/posixAccount.inc:1912 ../lib/modules/posixAccount.inc:1949
 msgid "Minimum UID number"
 msgstr "Minimum UID number"
 
@@ -7904,7 +7945,7 @@ msgid "Minimum UID number is invalid!"
 msgstr "Minimum UID number is invalid!"
 
 #: ../lib/modules/passwordSelfReset.inc:96
-#: ../lib/modules/passwordSelfReset.inc:654
+#: ../lib/modules/passwordSelfReset.inc:652
 msgid "Minimum answer length"
 msgstr "Minimum answer length"
 
@@ -7923,19 +7964,19 @@ msgstr "Minimum numeric characters"
 #: ../lib/types/ppolicyType.inc:78 ../lib/modules/shadowAccount.inc:57
 #: ../lib/modules/shadowAccount.inc:118 ../lib/modules/shadowAccount.inc:171
 #: ../lib/modules/shadowAccount.inc:185 ../lib/modules/shadowAccount.inc:221
-#: ../lib/modules/shadowAccount.inc:332 ../lib/modules/shadowAccount.inc:572
+#: ../lib/modules/shadowAccount.inc:332 ../lib/modules/shadowAccount.inc:570
 #: ../lib/modules/ppolicy.inc:84 ../lib/modules/ppolicy.inc:143
 #: ../lib/modules/ppolicy.inc:166 ../lib/modules/ppolicy.inc:198
-#: ../lib/modules/ppolicy.inc:473 ../lib/modules/sambaDomain.inc:125
+#: ../lib/modules/ppolicy.inc:471 ../lib/modules/sambaDomain.inc:125
 #: ../lib/modules/sambaDomain.inc:196 ../lib/modules/sambaDomain.inc:221
-#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:609
+#: ../lib/modules/sambaDomain.inc:324 ../lib/modules/sambaDomain.inc:607
 msgid "Minimum password age"
 msgstr "Minimum password age"
 
 #: ../templates/config/mainmanage.php:403 ../lib/types/ppolicyType.inc:87
 #: ../lib/modules/ppolicy.inc:120 ../lib/modules/ppolicy.inc:147
 #: ../lib/modules/ppolicy.inc:175 ../lib/modules/ppolicy.inc:247
-#: ../lib/modules/ppolicy.inc:481
+#: ../lib/modules/ppolicy.inc:479
 msgid "Minimum password length"
 msgstr "Minimum password length"
 
@@ -7943,9 +7984,9 @@ msgstr "Minimum password length"
 msgid "Minimum symbolic characters"
 msgstr "Minimum symbolic characters"
 
-#: ../lib/modules/bindDLZ.inc:223 ../lib/modules/bindDLZ.inc:326
-#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:525
-#: ../lib/modules/bindDLZ.inc:1030 ../lib/modules/bindDLZ.inc:1552
+#: ../lib/modules/bindDLZ.inc:226 ../lib/modules/bindDLZ.inc:329
+#: ../lib/modules/bindDLZ.inc:430 ../lib/modules/bindDLZ.inc:528
+#: ../lib/modules/bindDLZ.inc:1033 ../lib/modules/bindDLZ.inc:1553
 msgid "Minimum time"
 msgstr "Minimum time"
 
@@ -7963,42 +8004,42 @@ msgstr "Missing modify command add, delete or replace"
 
 #: ../lib/modules/windowsUser.inc:366 ../lib/modules/windowsUser.inc:621
 #: ../lib/modules/windowsUser.inc:904 ../lib/modules/windowsUser.inc:972
-#: ../lib/modules/windowsUser.inc:1109 ../lib/modules/windowsUser.inc:2447
-#: ../lib/modules/windowsUser.inc:3211
+#: ../lib/modules/windowsUser.inc:1109 ../lib/modules/windowsUser.inc:2445
+#: ../lib/modules/windowsUser.inc:3209
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../lib/types/user.inc:219 ../lib/modules/inetOrgPerson.inc:74
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:442
-#: ../lib/modules/inetOrgPerson.inc:595 ../lib/modules/inetOrgPerson.inc:724
-#: ../lib/modules/inetOrgPerson.inc:728 ../lib/modules/inetOrgPerson.inc:1479
-#: ../lib/modules/inetOrgPerson.inc:1482 ../lib/modules/inetOrgPerson.inc:1994
-#: ../lib/modules/inetOrgPerson.inc:3666 ../lib/modules/inetOrgPerson.inc:3721
+#: ../lib/types/user.inc:219 ../lib/modules/inetOrgPerson.inc:72
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:440
+#: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:722
+#: ../lib/modules/inetOrgPerson.inc:726 ../lib/modules/inetOrgPerson.inc:1477
+#: ../lib/modules/inetOrgPerson.inc:1480 ../lib/modules/inetOrgPerson.inc:1990
+#: ../lib/modules/inetOrgPerson.inc:3646 ../lib/modules/inetOrgPerson.inc:3701
 msgid "Mobile number"
 msgstr "Mobile number"
 
-#: ../lib/modules/inetOrgPerson.inc:2569
+#: ../lib/modules/inetOrgPerson.inc:2565
 msgid "Mobile telephone number"
 msgstr "Mobile telephone number"
 
 #: ../lib/modules/qmailGroup.inc:86 ../lib/modules/qmailGroup.inc:212
 #: ../lib/modules/qmailGroup.inc:216 ../lib/modules/qmailGroup.inc:345
 #: ../lib/modules/qmailGroup.inc:405 ../lib/modules/qmailGroup.inc:427
-#: ../lib/modules/qmailGroup.inc:517 ../lib/modules/qmailGroup.inc:1016
+#: ../lib/modules/qmailGroup.inc:517 ../lib/modules/qmailGroup.inc:1014
 msgid "Moderator email addresses"
 msgstr "Moderator email addresses"
 
 #: ../lib/modules/qmailGroup.inc:84 ../lib/modules/qmailGroup.inc:164
 #: ../lib/modules/qmailGroup.inc:168 ../lib/modules/qmailGroup.inc:287
 #: ../lib/modules/qmailGroup.inc:384 ../lib/modules/qmailGroup.inc:518
-#: ../lib/modules/qmailGroup.inc:786 ../lib/modules/qmailGroup.inc:1015
+#: ../lib/modules/qmailGroup.inc:786 ../lib/modules/qmailGroup.inc:1013
 msgid "Moderator entries"
 msgstr "Moderator entries"
 
 #: ../lib/modules/qmailGroup.inc:76 ../lib/modules/qmailGroup.inc:106
 #: ../lib/modules/qmailGroup.inc:200 ../lib/modules/qmailGroup.inc:329
 #: ../lib/modules/qmailGroup.inc:399 ../lib/modules/qmailGroup.inc:603
-#: ../lib/modules/qmailGroup.inc:1011
+#: ../lib/modules/qmailGroup.inc:1009
 msgid "Moderator text"
 msgstr "Moderator text"
 
@@ -8026,12 +8067,12 @@ msgstr "Modification time"
 msgid "Modified by"
 msgstr "Modified by"
 
-#: ../templates/serverInfo.php:314 ../templates/serverInfo.php:387
-#: ../templates/multiEdit.php:130
+#: ../templates/serverInfo.php:315 ../templates/serverInfo.php:388
+#: ../templates/multiEdit.php:153
 msgid "Modify"
 msgstr "Modify"
 
-#: ../templates/serverInfo.php:328 ../templates/serverInfo.php:393
+#: ../templates/serverInfo.php:329 ../templates/serverInfo.php:394
 msgid "Modify RDN"
 msgstr "Modify RDN"
 
@@ -8049,18 +8090,18 @@ msgstr "Modify group members"
 msgid "Modifying"
 msgstr "Modifying"
 
-#: ../templates/config/confmodules.php:182 ../templates/config/jobList.php:166
-#: ../templates/config/jobs.php:169 ../templates/config/confmain.php:223
-#: ../templates/config/moduleSettings.php:181
-#: ../templates/config/conftypes.php:200
-#: ../templates/selfService/adminMain.php:407
+#: ../templates/config/confmodules.php:192 ../templates/config/jobList.php:166
+#: ../templates/config/jobs.php:169 ../templates/config/confmain.php:226
+#: ../templates/config/moduleSettings.php:186
+#: ../templates/config/conftypes.php:219
+#: ../templates/selfService/adminMain.php:423
 msgid "Module settings"
 msgstr "Module settings"
 
-#: ../templates/config/confmodules.php:178 ../templates/config/jobList.php:162
-#: ../templates/config/jobs.php:165 ../templates/config/confmain.php:219
-#: ../templates/config/moduleSettings.php:177
-#: ../templates/config/conftypes.php:196
+#: ../templates/config/confmodules.php:188 ../templates/config/jobList.php:162
+#: ../templates/config/jobs.php:165 ../templates/config/confmain.php:222
+#: ../templates/config/moduleSettings.php:182
+#: ../templates/config/conftypes.php:215
 msgid "Modules"
 msgstr "Modules"
 
@@ -8068,18 +8109,18 @@ msgstr "Modules"
 msgid "Monday"
 msgstr "Monday"
 
-#: ../lib/modules/quota.inc:105 ../lib/modules/quota.inc:399
-#: ../lib/modules/quota.inc:506 ../lib/modules/quota.inc:633
-#: ../lib/modules/systemQuotas.inc:97 ../lib/modules/systemQuotas.inc:122
-#: ../lib/modules/systemQuotas.inc:386
+#: ../lib/modules/quota.inc:108 ../lib/modules/quota.inc:402
+#: ../lib/modules/quota.inc:509 ../lib/modules/quota.inc:634
+#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:125
+#: ../lib/modules/systemQuotas.inc:387
 msgid "Mountpoint"
 msgstr "Mountpoint"
 
-#: ../lib/modules/systemQuotas.inc:97 ../lib/modules/systemQuotas.inc:98
+#: ../lib/modules/systemQuotas.inc:100 ../lib/modules/systemQuotas.inc:101
 msgid "Mountpoint contains invalid characters."
 msgstr "Mountpoint contains invalid characters."
 
-#: ../lib/modules/quota.inc:106
+#: ../lib/modules/quota.inc:109
 msgid "Mountpoint of device with enabled quotas."
 msgstr "Mountpoint of device with enabled quotas."
 
@@ -8095,15 +8136,15 @@ msgstr "Move down"
 msgid "Move up"
 msgstr "Move up"
 
-#: ../templates/multiEdit.php:82 ../lib/tools/multiEdit.inc:44
+#: ../templates/multiEdit.php:101 ../lib/tools/multiEdit.inc:45
 msgid "Multi edit"
 msgstr "Multi edit"
 
-#: ../lib/modules/customFields.inc:1946 ../lib/modules/customFields.inc:3517
+#: ../lib/modules/customFields.inc:1944 ../lib/modules/customFields.inc:3515
 msgid "Multi value"
 msgstr "Multi value"
 
-#: ../lib/modules/customFields.inc:3358
+#: ../lib/modules/customFields.inc:3356
 msgid "Multi-select fields must not contain empty values."
 msgstr "Multi-select fields must not contain empty values."
 
@@ -8111,7 +8152,7 @@ msgstr "Multi-select fields must not contain empty values."
 #: ../lib/modules/zarafaDynamicGroup.inc:76 ../lib/modules/zarafaGroup.inc:83
 #: ../lib/modules/eduPerson.inc:98 ../lib/modules/eduPerson.inc:111
 #: ../lib/modules/eduPerson.inc:123 ../lib/modules/eduPerson.inc:139
-#: ../lib/modules/eduPerson.inc:147 ../lib/modules/zarafaUser.inc:178
+#: ../lib/modules/eduPerson.inc:147 ../lib/modules/zarafaUser.inc:181
 #: ../lib/modules/sudoRole.inc:100 ../lib/modules/sudoRole.inc:105
 #: ../lib/modules/sudoRole.inc:110 ../lib/modules/sudoRole.inc:115
 #: ../lib/modules/sudoRole.inc:120 ../lib/modules/sudoRole.inc:125
@@ -8120,34 +8161,34 @@ msgstr "Multiple values are separated by comma."
 
 #: ../lib/modules/kolabGroup.inc:92 ../lib/modules/kolabGroup.inc:101
 #: ../lib/modules/kolabGroup.inc:110 ../lib/modules/nisMailAliasUser.inc:81
-#: ../lib/modules/nisMailAliasUser.inc:89 ../lib/modules/puppetClient.inc:90
-#: ../lib/modules/puppetClient.inc:102 ../lib/modules/puppetClient.inc:110
-#: ../lib/modules/device.inc:74 ../lib/modules/bindDLZ.inc:98
-#: ../lib/modules/bindDLZ.inc:107 ../lib/modules/bindDLZ.inc:112
-#: ../lib/modules/bindDLZ.inc:117 ../lib/modules/bindDLZ.inc:122
-#: ../lib/modules/bindDLZ.inc:127 ../lib/modules/bindDLZ.inc:132
-#: ../lib/modules/bindDLZ.inc:144 ../lib/modules/bindDLZ.inc:152
-#: ../lib/modules/bindDLZ.inc:160 ../lib/modules/bindDLZ.inc:168
-#: ../lib/modules/bindDLZ.inc:176 ../lib/modules/bindDLZ.inc:184
-#: ../lib/modules/bindDLZ.inc:192 ../lib/modules/bindDLZ.inc:200
-#: ../lib/modules/bindDLZ.inc:208 ../lib/modules/windowsUser.inc:163
+#: ../lib/modules/nisMailAliasUser.inc:89 ../lib/modules/puppetClient.inc:93
+#: ../lib/modules/puppetClient.inc:105 ../lib/modules/puppetClient.inc:113
+#: ../lib/modules/device.inc:77 ../lib/modules/bindDLZ.inc:101
+#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:115
+#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:125
+#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:135
+#: ../lib/modules/bindDLZ.inc:147 ../lib/modules/bindDLZ.inc:155
+#: ../lib/modules/bindDLZ.inc:163 ../lib/modules/bindDLZ.inc:171
+#: ../lib/modules/bindDLZ.inc:179 ../lib/modules/bindDLZ.inc:187
+#: ../lib/modules/bindDLZ.inc:195 ../lib/modules/bindDLZ.inc:203
+#: ../lib/modules/bindDLZ.inc:211 ../lib/modules/windowsUser.inc:163
 #: ../lib/modules/windowsUser.inc:203 ../lib/modules/windowsUser.inc:237
 #: ../lib/modules/windowsUser.inc:248 ../lib/modules/windowsUser.inc:319
 #: ../lib/modules/windowsUser.inc:327 ../lib/modules/windowsUser.inc:335
 #: ../lib/modules/windowsUser.inc:343 ../lib/modules/windowsUser.inc:363
 #: ../lib/modules/windowsUser.inc:375 ../lib/modules/windowsUser.inc:383
-#: ../lib/modules/kolabUser.inc:158 ../lib/modules/kolabUser.inc:167
-#: ../lib/modules/inetOrgPerson.inc:661 ../lib/modules/inetOrgPerson.inc:681
-#: ../lib/modules/inetOrgPerson.inc:689 ../lib/modules/inetOrgPerson.inc:697
-#: ../lib/modules/inetOrgPerson.inc:705 ../lib/modules/inetOrgPerson.inc:721
-#: ../lib/modules/inetOrgPerson.inc:729 ../lib/modules/inetOrgPerson.inc:737
-#: ../lib/modules/inetOrgPerson.inc:745 ../lib/modules/inetOrgPerson.inc:753
-#: ../lib/modules/inetOrgPerson.inc:764 ../lib/modules/inetOrgPerson.inc:784
-#: ../lib/modules/inetOrgPerson.inc:796 ../lib/modules/inetOrgPerson.inc:804
-#: ../lib/modules/inetOrgPerson.inc:812 ../lib/modules/inetOrgPerson.inc:824
-#: ../lib/modules/inetOrgPerson.inc:832 ../lib/modules/inetOrgPerson.inc:849
-#: ../lib/modules/inetOrgPerson.inc:857 ../lib/modules/inetOrgPerson.inc:865
-#: ../lib/modules/systemQuotas.inc:70 ../lib/modules/freeRadius.inc:105
+#: ../lib/modules/kolabUser.inc:161 ../lib/modules/kolabUser.inc:170
+#: ../lib/modules/inetOrgPerson.inc:659 ../lib/modules/inetOrgPerson.inc:679
+#: ../lib/modules/inetOrgPerson.inc:687 ../lib/modules/inetOrgPerson.inc:695
+#: ../lib/modules/inetOrgPerson.inc:703 ../lib/modules/inetOrgPerson.inc:719
+#: ../lib/modules/inetOrgPerson.inc:727 ../lib/modules/inetOrgPerson.inc:735
+#: ../lib/modules/inetOrgPerson.inc:743 ../lib/modules/inetOrgPerson.inc:751
+#: ../lib/modules/inetOrgPerson.inc:762 ../lib/modules/inetOrgPerson.inc:782
+#: ../lib/modules/inetOrgPerson.inc:794 ../lib/modules/inetOrgPerson.inc:802
+#: ../lib/modules/inetOrgPerson.inc:810 ../lib/modules/inetOrgPerson.inc:822
+#: ../lib/modules/inetOrgPerson.inc:830 ../lib/modules/inetOrgPerson.inc:847
+#: ../lib/modules/inetOrgPerson.inc:855 ../lib/modules/inetOrgPerson.inc:863
+#: ../lib/modules/systemQuotas.inc:73 ../lib/modules/freeRadius.inc:105
 #: ../lib/modules/kolabSharedFolder.inc:126
 #: ../lib/modules/kolabSharedFolder.inc:135 ../lib/modules/qmailGroup.inc:128
 #: ../lib/modules/qmailGroup.inc:136 ../lib/modules/qmailGroup.inc:149
@@ -8155,7 +8196,7 @@ msgstr "Multiple values are separated by comma."
 #: ../lib/modules/qmailGroup.inc:177 ../lib/modules/qmailGroup.inc:185
 #: ../lib/modules/qmailGroup.inc:193 ../lib/modules/qmailGroup.inc:209
 #: ../lib/modules/qmailGroup.inc:217 ../lib/modules/qmailGroup.inc:225
-#: ../lib/modules/groupOfNames.inc:98
+#: ../lib/modules/groupOfNames.inc:101
 msgid "Multiple values are separated by semicolon."
 msgstr "Multiple values are separated by semicolon."
 
@@ -8163,8 +8204,8 @@ msgstr "Multiple values are separated by semicolon."
 #: ../lib/modules/asteriskAccount.inc:290
 #: ../lib/modules/asteriskAccount.inc:486
 #: ../lib/modules/asteriskAccount.inc:717
-#: ../lib/modules/asteriskAccount.inc:1009
-#: ../lib/modules/asteriskAccount.inc:1284
+#: ../lib/modules/asteriskAccount.inc:1007
+#: ../lib/modules/asteriskAccount.inc:1282
 msgid "Music on hold"
 msgstr "Music on hold"
 
@@ -8173,9 +8214,9 @@ msgid "Music to play on hold."
 msgstr "Music to play on hold."
 
 #: ../lib/modules/ipHost.inc:99 ../lib/modules/windowsHost.inc:108
-#: ../lib/modules/device.inc:111 ../lib/modules/windowsUser.inc:468
-#: ../lib/modules/inetOrgPerson.inc:404 ../lib/modules/inetOrgPerson.inc:412
-#: ../lib/modules/inetOrgPerson.inc:526
+#: ../lib/modules/device.inc:114 ../lib/modules/windowsUser.inc:468
+#: ../lib/modules/inetOrgPerson.inc:402 ../lib/modules/inetOrgPerson.inc:410
+#: ../lib/modules/inetOrgPerson.inc:524
 msgid "MyCity"
 msgstr "MyCity"
 
@@ -8183,7 +8224,7 @@ msgstr "MyCity"
 msgid "MySQL"
 msgstr "MySQL"
 
-#: ../lib/modules/windowsUser.inc:450 ../lib/modules/inetOrgPerson.inc:388
+#: ../lib/modules/windowsUser.inc:450 ../lib/modules/inetOrgPerson.inc:386
 msgid "Mystreetname 42"
 msgstr "Mystreetname 42"
 
@@ -8191,8 +8232,8 @@ msgstr "Mystreetname 42"
 #: ../lib/modules/asteriskAccount.inc:279
 #: ../lib/modules/asteriskAccount.inc:406
 #: ../lib/modules/asteriskAccount.inc:669
-#: ../lib/modules/asteriskAccount.inc:998
-#: ../lib/modules/asteriskAccount.inc:1262
+#: ../lib/modules/asteriskAccount.inc:996
+#: ../lib/modules/asteriskAccount.inc:1260
 msgid "NAT"
 msgstr "NAT"
 
@@ -8200,36 +8241,36 @@ msgstr "NAT"
 msgid "NAT setting for this account."
 msgstr "NAT setting for this account."
 
-#: ../lib/modules/windowsUser.inc:1236 ../lib/modules/windowsGroup.inc:377
+#: ../lib/modules/windowsUser.inc:1236 ../lib/modules/windowsGroup.inc:380
 msgid "NIS"
 msgstr "NIS"
 
 #: ../lib/modules/windowsUser.inc:270 ../lib/modules/windowsUser.inc:662
 #: ../lib/modules/windowsUser.inc:749 ../lib/modules/windowsUser.inc:859
-#: ../lib/modules/windowsUser.inc:1241 ../lib/modules/windowsUser.inc:2453
-#: ../lib/modules/windowsUser.inc:3217 ../lib/modules/windowsGroup.inc:160
-#: ../lib/modules/windowsGroup.inc:175 ../lib/modules/windowsGroup.inc:249
-#: ../lib/modules/windowsGroup.inc:257 ../lib/modules/windowsGroup.inc:281
-#: ../lib/modules/windowsGroup.inc:382 ../lib/modules/windowsGroup.inc:916
+#: ../lib/modules/windowsUser.inc:1241 ../lib/modules/windowsUser.inc:2451
+#: ../lib/modules/windowsUser.inc:3215 ../lib/modules/windowsGroup.inc:163
+#: ../lib/modules/windowsGroup.inc:178 ../lib/modules/windowsGroup.inc:252
+#: ../lib/modules/windowsGroup.inc:260 ../lib/modules/windowsGroup.inc:284
+#: ../lib/modules/windowsGroup.inc:385 ../lib/modules/windowsGroup.inc:917
 msgid "NIS domain"
 msgstr "NIS domain"
 
-#: ../lib/modules/windowsUser.inc:271 ../lib/modules/windowsGroup.inc:161
+#: ../lib/modules/windowsUser.inc:271 ../lib/modules/windowsGroup.inc:164
 msgid "NIS domain name."
 msgstr "NIS domain name."
 
 #: ../lib/modules/windowsUser.inc:266 ../lib/modules/windowsUser.inc:654
 #: ../lib/modules/windowsUser.inc:856 ../lib/modules/windowsUser.inc:991
-#: ../lib/modules/windowsUser.inc:1238 ../lib/modules/windowsUser.inc:2452
-#: ../lib/modules/windowsUser.inc:3216 ../lib/modules/windowsGroup.inc:156
-#: ../lib/modules/windowsGroup.inc:174 ../lib/modules/windowsGroup.inc:241
-#: ../lib/modules/windowsGroup.inc:278 ../lib/modules/windowsGroup.inc:296
-#: ../lib/modules/windowsGroup.inc:379 ../lib/modules/windowsGroup.inc:915
+#: ../lib/modules/windowsUser.inc:1238 ../lib/modules/windowsUser.inc:2450
+#: ../lib/modules/windowsUser.inc:3214 ../lib/modules/windowsGroup.inc:159
+#: ../lib/modules/windowsGroup.inc:177 ../lib/modules/windowsGroup.inc:244
+#: ../lib/modules/windowsGroup.inc:281 ../lib/modules/windowsGroup.inc:299
+#: ../lib/modules/windowsGroup.inc:382 ../lib/modules/windowsGroup.inc:916
 msgid "NIS name"
 msgstr "NIS name"
 
 #: ../lib/modules/windowsUser.inc:991 ../lib/modules/windowsUser.inc:992
-#: ../lib/modules/windowsGroup.inc:296 ../lib/modules/windowsGroup.inc:297
+#: ../lib/modules/windowsGroup.inc:299 ../lib/modules/windowsGroup.inc:300
 msgid ""
 "NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
@@ -8237,12 +8278,12 @@ msgstr ""
 "NIS name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 "
 "and .-_ !"
 
-#: ../lib/modules/nisnetgroup.inc:67
+#: ../lib/modules/nisnetgroup.inc:70
 msgid "NIS net group"
 msgstr "NIS net group"
 
-#: ../lib/modules/nisNetGroupUser.inc:70 ../lib/modules/nisNetGroupUser.inc:72
-#: ../lib/modules/nisNetGroupUser.inc:76
+#: ../lib/modules/nisNetGroupUser.inc:73 ../lib/modules/nisNetGroupUser.inc:75
+#: ../lib/modules/nisNetGroupUser.inc:79
 msgid "NIS net groups"
 msgstr "NIS net groups"
 
@@ -8271,44 +8312,44 @@ msgstr "NIS object entries"
 msgid "NIS objects"
 msgstr "NIS objects"
 
-#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:364
-#: ../lib/modules/bindDLZ.inc:370 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:123 ../lib/modules/bindDLZ.inc:367
+#: ../lib/modules/bindDLZ.inc:373 ../lib/modules/bindDLZ.inc:492
 msgid "NS record"
 msgstr "NS record"
 
-#: ../templates/serverInfo.php:147 ../templates/masscreate.php:294
-#: ../templates/masscreate.php:368 ../templates/config/jobList.php:216
-#: ../templates/schema/schema.php:268 ../lib/types/automountType.inc:86
-#: ../lib/types/automountType.inc:249 ../lib/types/nsviewType.inc:77
+#: ../templates/serverInfo.php:148 ../templates/config/jobList.php:216
+#: ../templates/schema/schema.php:269 ../templates/upload/masscreate.php:320
+#: ../templates/upload/masscreate.php:394 ../lib/types/automountType.inc:86
+#: ../lib/types/automountType.inc:226 ../lib/types/nsviewType.inc:77
 #: ../lib/types/oracleContextType.inc:77 ../lib/types/ppolicyType.inc:77
-#: ../lib/types/bind.inc:190 ../lib/modules/device.inc:61
-#: ../lib/modules/device.inc:89 ../lib/modules/device.inc:120
-#: ../lib/modules/device.inc:170 ../lib/modules/device.inc:409
-#: ../lib/modules/range.inc:117 ../lib/modules/range.inc:138
-#: ../lib/modules/range.inc:553 ../lib/modules/nisObject.inc:61
+#: ../lib/types/bind.inc:167 ../lib/modules/device.inc:64
+#: ../lib/modules/device.inc:92 ../lib/modules/device.inc:123
+#: ../lib/modules/device.inc:173 ../lib/modules/device.inc:410
+#: ../lib/modules/range.inc:120 ../lib/modules/range.inc:141
+#: ../lib/modules/range.inc:556 ../lib/modules/nisObject.inc:61
 #: ../lib/modules/nisObject.inc:81 ../lib/modules/nisObject.inc:111
-#: ../lib/modules/nisObject.inc:137 ../lib/modules/nisObject.inc:212
+#: ../lib/modules/nisObject.inc:137 ../lib/modules/nisObject.inc:210
 #: ../lib/modules/ppolicy.inc:80 ../lib/modules/ppolicy.inc:142
 #: ../lib/modules/ppolicy.inc:165 ../lib/modules/ppolicy.inc:190
-#: ../lib/modules/ppolicy.inc:472 ../lib/modules/automount.inc:64
+#: ../lib/modules/ppolicy.inc:470 ../lib/modules/automount.inc:64
 #: ../lib/modules/automount.inc:80 ../lib/modules/automount.inc:103
-#: ../lib/modules/automount.inc:128 ../lib/modules/automount.inc:184
+#: ../lib/modules/automount.inc:128 ../lib/modules/automount.inc:182
 #: ../lib/modules/kolabSharedFolder.inc:112
 #: ../lib/modules/kolabSharedFolder.inc:174
 #: ../lib/modules/kolabSharedFolder.inc:233
 #: ../lib/modules/kolabSharedFolder.inc:261
 #: ../lib/modules/kolabSharedFolder.inc:279
-#: ../lib/modules/kolabSharedFolder.inc:520
+#: ../lib/modules/kolabSharedFolder.inc:518
 #: ../lib/modules/asteriskExtension.inc:822 ../lib/modules/nsview.inc:64
 #: ../lib/modules/nsview.inc:71 ../lib/modules/nsview.inc:87
 #: ../lib/modules/nsview.inc:110 ../lib/modules/nsview.inc:124
-#: ../lib/modules/nsview.inc:163 ../lib/modules/oracleService.inc:61
+#: ../lib/modules/nsview.inc:161 ../lib/modules/oracleService.inc:61
 #: ../lib/modules/oracleService.inc:77 ../lib/modules/oracleService.inc:98
-#: ../lib/modules/oracleService.inc:121 ../lib/modules/oracleService.inc:173
-#: ../lib/modules/customFields.inc:84 ../lib/modules/customFields.inc:1046
-#: ../lib/modules/customFields.inc:1712
-#: ../lib/modules/organizationalRole.inc:186
-#: ../lib/modules/groupOfNames.inc:234
+#: ../lib/modules/oracleService.inc:121 ../lib/modules/oracleService.inc:171
+#: ../lib/modules/customFields.inc:84 ../lib/modules/customFields.inc:1044
+#: ../lib/modules/customFields.inc:1710
+#: ../lib/modules/organizationalRole.inc:189
+#: ../lib/modules/groupOfNames.inc:237
 msgid "Name"
 msgstr "Name"
 
@@ -8320,17 +8361,17 @@ msgstr "Name of new alias entry."
 msgid "Name of the address list which should be created."
 msgstr "Name of the address list which should be created."
 
-#: ../lib/modules/bindDLZ.inc:155 ../lib/modules/bindDLZ.inc:159
-#: ../lib/modules/bindDLZ.inc:364 ../lib/modules/bindDLZ.inc:506
-#: ../lib/modules/bindDLZ.inc:1169
+#: ../lib/modules/bindDLZ.inc:158 ../lib/modules/bindDLZ.inc:162
+#: ../lib/modules/bindDLZ.inc:367 ../lib/modules/bindDLZ.inc:509
+#: ../lib/modules/bindDLZ.inc:1172
 msgid "Name server"
 msgstr "Name server"
 
-#: ../lib/modules/bindDLZ.inc:431 ../lib/modules/bindDLZ.inc:1569
+#: ../lib/modules/bindDLZ.inc:434 ../lib/modules/bindDLZ.inc:1570
 msgid "Name servers"
 msgstr "Name servers"
 
-#: ../lib/modules/bindDLZ.inc:1167
+#: ../lib/modules/bindDLZ.inc:1170
 msgid "Name servers (\"NS\" records)"
 msgstr "Name servers (\"NS\" records)"
 
@@ -8347,23 +8388,23 @@ msgid "Named object"
 msgstr "Named object"
 
 #: ../lib/modules/dhcp_settings.inc:198 ../lib/modules/dhcp_settings.inc:221
-#: ../lib/modules/dhcp_settings.inc:612 ../lib/modules/dhcp_settings.inc:688
+#: ../lib/modules/dhcp_settings.inc:612 ../lib/modules/dhcp_settings.inc:686
 #: ../lib/modules/freeRadius.inc:92 ../lib/modules/freeRadius.inc:134
 #: ../lib/modules/freeRadius.inc:214 ../lib/modules/freeRadius.inc:258
 #: ../lib/modules/freeRadius.inc:308 ../lib/modules/freeRadius.inc:367
-#: ../lib/modules/freeRadius.inc:696
+#: ../lib/modules/freeRadius.inc:694
 msgid "Net mask"
 msgstr "Net mask"
 
 #: ../lib/modules/dhcp_settings.inc:174 ../lib/modules/dhcp_settings.inc:218
 #: ../lib/modules/dhcp_settings.inc:233 ../lib/modules/dhcp_settings.inc:285
-#: ../lib/modules/dhcp_settings.inc:583 ../lib/modules/dhcp_settings.inc:682
+#: ../lib/modules/dhcp_settings.inc:583 ../lib/modules/dhcp_settings.inc:680
 msgid "Netbios name servers"
 msgstr "Netbios name servers"
 
 #: ../lib/modules/dhcp_settings.inc:178 ../lib/modules/dhcp_settings.inc:219
 #: ../lib/modules/dhcp_settings.inc:235 ../lib/modules/dhcp_settings.inc:291
-#: ../lib/modules/dhcp_settings.inc:593 ../lib/modules/dhcp_settings.inc:683
+#: ../lib/modules/dhcp_settings.inc:593 ../lib/modules/dhcp_settings.inc:681
 msgid "Netbios node type"
 msgstr "Netbios node type"
 
@@ -8371,7 +8412,7 @@ msgstr "Netbios node type"
 msgid "New DHCP"
 msgstr "New DHCP"
 
-#: ../lib/types/bind.inc:100 ../lib/types/bind.inc:161
+#: ../lib/types/bind.inc:100 ../lib/types/bind.inc:138
 msgid "New DNS entry"
 msgstr "New DNS entry"
 
@@ -8379,11 +8420,11 @@ msgstr "New DNS entry"
 msgid "New NIS object"
 msgstr "New NIS object"
 
-#: ../templates/ou_edit.php:81
+#: ../templates/ou_edit.php:91
 msgid "New OU created successfully."
 msgstr "New OU created successfully."
 
-#: ../lib/modules/windowsUser.inc:474 ../lib/modules/inetOrgPerson.inc:534
+#: ../lib/modules/windowsUser.inc:474 ../lib/modules/inetOrgPerson.inc:532
 msgid "New York"
 msgstr "New York"
 
@@ -8397,11 +8438,11 @@ msgstr "New address list"
 msgid "New alias"
 msgstr "New alias"
 
-#: ../lib/types/automountType.inc:110 ../lib/types/automountType.inc:217
+#: ../lib/types/automountType.inc:110 ../lib/types/automountType.inc:194
 msgid "New automount entry"
 msgstr "New automount entry"
 
-#: ../lib/types/automountType.inc:233 ../lib/types/automountType.inc:234
+#: ../lib/types/automountType.inc:210 ../lib/types/automountType.inc:211
 msgid "New automount map"
 msgstr "New automount map"
 
@@ -8411,7 +8452,7 @@ msgid "New billing code"
 msgstr "New billing code"
 
 #: ../lib/types/oracleContextType.inc:101
-#: ../lib/types/oracleContextType.inc:188
+#: ../lib/types/oracleContextType.inc:169
 msgid "New database entry"
 msgstr "New database entry"
 
@@ -8427,7 +8468,7 @@ msgstr "New domain"
 msgid "New extension"
 msgstr "New extension"
 
-#: ../templates/pdfedit/pdfpage.php:624
+#: ../templates/pdfedit/pdfpage.php:641
 msgid "New field"
 msgstr "New field"
 
@@ -8455,18 +8496,18 @@ msgstr "New master password"
 msgid "New master password set successfully."
 msgstr "New master password set successfully."
 
-#: ../lib/lists.inc:114
+#: ../lib/lists.inc:116
 msgid "New object"
 msgstr "New object"
 
-#: ../templates/ou_edit.php:190 ../help/help.inc:301
+#: ../templates/ou_edit.php:202 ../help/help.inc:313
 msgid "New organisational unit"
 msgstr "New organisational unit"
 
-#: ../templates/config/confmain.php:528
-#: ../lib/modules/sambaSamAccount.inc:2313
-#: ../lib/modules/posixAccount.inc:2746 ../lib/modules/windowsUser.inc:2597
-#: ../lib/modules/passwordSelfReset.inc:1279
+#: ../templates/config/confmain.php:563
+#: ../lib/modules/sambaSamAccount.inc:2311
+#: ../lib/modules/posixAccount.inc:2744 ../lib/modules/windowsUser.inc:2595
+#: ../lib/modules/passwordSelfReset.inc:1277
 msgid "New password"
 msgstr "New password"
 
@@ -8478,7 +8519,7 @@ msgstr "New password set successfully."
 msgid "New policy"
 msgstr "New policy"
 
-#: ../lib/modules/range.inc:113 ../lib/modules/range.inc:627
+#: ../lib/modules/range.inc:116 ../lib/modules/range.inc:630
 msgid "New pool"
 msgstr "New pool"
 
@@ -8492,8 +8533,8 @@ msgstr "New printer"
 msgid "New profile name"
 msgstr "New profile name"
 
-#: ../lib/modules/range.inc:109 ../lib/modules/range.inc:136
-#: ../lib/modules/range.inc:542 ../lib/modules/range.inc:616
+#: ../lib/modules/range.inc:112 ../lib/modules/range.inc:139
+#: ../lib/modules/range.inc:545 ../lib/modules/range.inc:619
 msgid "New range"
 msgstr "New range"
 
@@ -8509,7 +8550,7 @@ msgstr "New required attributes"
 msgid "New role"
 msgstr "New role"
 
-#: ../templates/pdfedit/pdfpage.php:592
+#: ../templates/pdfedit/pdfpage.php:608
 msgid "New section"
 msgstr "New section"
 
@@ -8526,7 +8567,7 @@ msgstr "New sudo role"
 msgid "New user"
 msgstr "New user"
 
-#: ../lib/modules/inetOrgPerson.inc:1917
+#: ../lib/modules/inetOrgPerson.inc:1915
 msgid "New user certificate"
 msgstr "New user certificate"
 
@@ -8539,13 +8580,13 @@ msgstr "New value"
 msgid "New view"
 msgstr "New view"
 
-#: ../lib/types/bind.inc:174 ../lib/types/bind.inc:175
+#: ../lib/types/bind.inc:151 ../lib/types/bind.inc:152
 msgid "New zone"
 msgstr "New zone"
 
 #: ../lib/modules/sambaDomain.inc:85 ../lib/modules/sambaDomain.inc:165
 #: ../lib/modules/sambaDomain.inc:186 ../lib/modules/sambaDomain.inc:361
-#: ../lib/modules/sambaDomain.inc:602
+#: ../lib/modules/sambaDomain.inc:600
 msgid "Next RID"
 msgstr "Next RID"
 
@@ -8567,7 +8608,7 @@ msgstr "Next RID to use when creating user accounts (only used by Winbind)."
 
 #: ../lib/modules/sambaDomain.inc:93 ../lib/modules/sambaDomain.inc:177
 #: ../lib/modules/sambaDomain.inc:188 ../lib/modules/sambaDomain.inc:377
-#: ../lib/modules/sambaDomain.inc:604
+#: ../lib/modules/sambaDomain.inc:602
 msgid "Next group RID"
 msgstr "Next group RID"
 
@@ -8577,7 +8618,7 @@ msgstr "Next group RID is not a number!"
 
 #: ../lib/modules/sambaDomain.inc:89 ../lib/modules/sambaDomain.inc:171
 #: ../lib/modules/sambaDomain.inc:187 ../lib/modules/sambaDomain.inc:369
-#: ../lib/modules/sambaDomain.inc:603
+#: ../lib/modules/sambaDomain.inc:601
 msgid "Next user RID"
 msgstr "Next user RID"
 
@@ -8587,21 +8628,21 @@ msgstr "Next user RID is not a number!"
 
 #: ../lib/modules/eduPerson.inc:101 ../lib/modules/eduPerson.inc:188
 #: ../lib/modules/eduPerson.inc:226 ../lib/modules/eduPerson.inc:342
-#: ../lib/modules/eduPerson.inc:561
+#: ../lib/modules/eduPerson.inc:559
 msgid "Nick names"
 msgstr "Nick names"
 
-#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
-#: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:464 ../lib/modules/pykotaPrinter.inc:52
+#: ../templates/schema/schema.php:154 ../templates/schema/schema.php:196
+#: ../templates/schema/schema.php:201 ../templates/schema/schema.php:206
+#: ../templates/pdfedit/pdfpage.php:479 ../lib/modules/pykotaPrinter.inc:52
 #: ../lib/modules/pykotaPrinter.inc:168 ../lib/modules/pykotaPrinter.inc:169
 #: ../lib/modules/pykotaPrinter.inc:170 ../lib/modules/freeRadius.inc:161
-#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:707
+#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:705
 #: ../lib/modules/qmailGroup.inc:321 ../lib/modules/qmailGroup.inc:322
 #: ../lib/modules/qmailGroup.inc:323 ../lib/modules/qmailGroup.inc:363
 #: ../lib/modules/qmailGroup.inc:364 ../lib/modules/qmailGroup.inc:365
-#: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:1021
-#: ../lib/modules/qmailGroup.inc:1027 ../lib/modules/imapAccess.inc:468
+#: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:1019
+#: ../lib/modules/qmailGroup.inc:1025 ../lib/modules/imapAccess.inc:468
 msgid "No"
 msgstr "No"
 
@@ -8613,7 +8654,7 @@ msgstr "No Asterisk extensions found."
 msgid "No DHCPs found!"
 msgstr "No DHCPs found!"
 
-#: ../lib/types/bind.inc:160
+#: ../lib/types/bind.inc:137
 msgid "No DNS entries found!"
 msgstr "No DNS entries found!"
 
@@ -8647,7 +8688,7 @@ msgstr "No address list found!"
 msgid "No aliases found!"
 msgstr "No aliases found!"
 
-#: ../lib/types/automountType.inc:216
+#: ../lib/types/automountType.inc:193
 msgid "No automount entries found!"
 msgstr "No automount entries found!"
 
@@ -8659,7 +8700,7 @@ msgstr "No billing codes found!"
 msgid "No binary data available"
 msgstr "No binary data available"
 
-#: ../templates/initsuff.php:168
+#: ../templates/initsuff.php:169
 msgid "No changes were made."
 msgstr "No changes were made."
 
@@ -8668,17 +8709,17 @@ msgstr "No changes were made."
 msgid "No current value for attribute <b>%s</b>."
 msgstr "No current value for attribute <b>%s</b>."
 
-#: ../lib/types/oracleContextType.inc:187
+#: ../lib/types/oracleContextType.inc:168
 msgid "No database entries found!"
 msgstr "No database entries found!"
 
-#: ../templates/login.php:110
+#: ../templates/login.php:112
 msgid ""
 "No default profile set. Please set it in the server profile configuration."
 msgstr ""
 "No default profile set. Please set it in the server profile configuration."
 
-#: ../templates/schema/schema.php:144
+#: ../templates/schema/schema.php:145
 msgid "No description"
 msgstr "No description"
 
@@ -8686,7 +8727,7 @@ msgstr "No description"
 msgid "No domains found!"
 msgstr "No domains found!"
 
-#: ../lib/modules/passwordSelfReset.inc:1792
+#: ../lib/modules/passwordSelfReset.inc:1790
 msgid "No email address found."
 msgstr "No email address found."
 
@@ -8695,14 +8736,14 @@ msgstr "No email address found."
 msgid "No entry was selected to delete"
 msgstr "No entry was selected to delete"
 
-#: ../lib/modules/ldapPublicKey.inc:582 ../lib/modules/inetOrgPerson.inc:3357
-#: ../lib/modules/customFields.inc:3858
+#: ../lib/modules/ldapPublicKey.inc:583 ../lib/modules/inetOrgPerson.inc:3359
+#: ../lib/modules/customFields.inc:3856
 msgid "No file received."
 msgstr "No file received."
 
 #: ../templates/config/mainmanage.php:169 ../lib/modules/windowsUser.inc:1002
-#: ../lib/modules/ldapPublicKey.inc:128 ../lib/modules/inetOrgPerson.inc:101
-#: ../lib/modules/customFields.inc:3793
+#: ../lib/modules/ldapPublicKey.inc:131 ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/customFields.inc:3791
 msgid "No file selected."
 msgstr "No file selected."
 
@@ -8710,7 +8751,7 @@ msgstr "No file selected."
 msgid "No forwarding"
 msgstr "No forwarding"
 
-#: ../lib/modules/posixGroup.inc:661 ../lib/modules/posixAccount.inc:104
+#: ../lib/modules/posixGroup.inc:659 ../lib/modules/posixAccount.inc:104
 msgid "No free ID-Number!"
 msgstr "No free ID-Number!"
 
@@ -8735,12 +8776,12 @@ msgstr "No import input"
 msgid "No internal attributes"
 msgstr "No internal attributes"
 
-#: ../templates/tests/lamdaemonTest.php:195
+#: ../templates/tests/lamdaemonTest.php:196
 msgid "No lamdaemon path set, please update your LAM configuration settings."
 msgstr "No lamdaemon path set, please update your LAM configuration settings."
 
-#: ../templates/tests/lamdaemonTest.php:97
-#: ../templates/tests/lamdaemonTest.php:190
+#: ../templates/tests/lamdaemonTest.php:98
+#: ../templates/tests/lamdaemonTest.php:191
 msgid "No lamdaemon server set, please update your LAM configuration settings."
 msgstr ""
 "No lamdaemon server set, please update your LAM configuration settings."
@@ -8753,7 +8794,7 @@ msgstr "No local delivery"
 msgid "No logging"
 msgstr "No logging"
 
-#: ../templates/pdfedit/pdfpage.php:433
+#: ../templates/pdfedit/pdfpage.php:448
 msgid "No logo"
 msgstr "No logo"
 
@@ -8761,20 +8802,20 @@ msgstr "No logo"
 msgid "No new attributes available for this entry"
 msgstr "No new attributes available for this entry"
 
-#: ../templates/config/conftypes.php:338 ../help/help.inc:178
+#: ../templates/config/conftypes.php:356 ../help/help.inc:178
 msgid "No new entries"
 msgstr "No new entries"
 
-#: ../templates/multiEdit.php:320 ../lib/lists.inc:113
+#: ../templates/multiEdit.php:343 ../lib/lists.inc:115
 msgid "No objects found!"
 msgstr "No objects found!"
 
-#: ../templates/config/confmodules.php:435
+#: ../templates/config/confmodules.php:443
 msgid "No or more than one base module selected!"
 msgstr "No or more than one base module selected!"
 
-#: ../templates/config/confsave.php:53 ../templates/config/confmain.php:55
-#: ../lib/modules/passwordSelfReset.inc:1405
+#: ../templates/config/confsave.php:53 ../templates/config/confmain.php:58
+#: ../lib/modules/passwordSelfReset.inc:1403
 msgid "No password was entered!"
 msgstr "No password was entered!"
 
@@ -8786,7 +8827,7 @@ msgstr "No policies found!"
 msgid "No printers found!"
 msgstr "No printers found!"
 
-#: ../templates/tests/schemaTest.php:70
+#: ../templates/tests/schemaTest.php:73
 msgid "No problems found."
 msgstr "No problems found."
 
@@ -8798,7 +8839,7 @@ msgstr "No profile found."
 msgid "No program delivery"
 msgstr "No program delivery"
 
-#: ../lib/modules/pykotaGroup.inc:63 ../lib/modules/pykotaUser.inc:63
+#: ../lib/modules/pykotaGroup.inc:63 ../lib/modules/pykotaUser.inc:66
 msgid "No quota"
 msgstr "No quota"
 
@@ -8810,11 +8851,11 @@ msgstr "No roles found!"
 msgid "No scripts to run."
 msgstr "No scripts to run."
 
-#: ../templates/pdfedit/pdfpage.php:141
+#: ../templates/pdfedit/pdfpage.php:159
 msgid "No section text specified"
 msgstr "No section text specified"
 
-#: ../lib/modules/passwordSelfReset.inc:1442
+#: ../lib/modules/passwordSelfReset.inc:1440
 msgid "No security answer found."
 msgstr "No security answer found."
 
@@ -8826,7 +8867,7 @@ msgstr "No server profiles found. Please create one."
 msgid "No shared folders found!"
 msgstr "No shared folders found!"
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:147
 msgid "No static text specified"
 msgstr "No static text specified"
 
@@ -8844,7 +8885,7 @@ msgstr "No such entry"
 msgid "No such entry."
 msgstr "No such entry."
 
-#: ../templates/schema/schema.php:438
+#: ../templates/schema/schema.php:439
 #, php-format
 msgid "No such schema item: \"%s\""
 msgstr "No such schema item: \"%s\""
@@ -8865,19 +8906,20 @@ msgstr "No views found!"
 msgid "Non-standard (\\n)"
 msgstr "Non-standard (\\n)"
 
-#: ../lib/modules/qmailUser.inc:58
+#: ../templates/config/confmain.php:535
+#: ../templates/selfService/adminMain.php:507 ../lib/modules/qmailUser.inc:58
 msgid "None"
 msgstr "None"
 
 #: ../lib/modules/sudoRole.inc:133 ../lib/modules/sudoRole.inc:195
 #: ../lib/modules/sudoRole.inc:222 ../lib/modules/sudoRole.inc:281
-#: ../lib/modules/sudoRole.inc:481 ../lib/modules/sudoRole.inc:771
+#: ../lib/modules/sudoRole.inc:481 ../lib/modules/sudoRole.inc:769
 msgid "Not after"
 msgstr "Not after"
 
 #: ../lib/modules/sudoRole.inc:128 ../lib/modules/sudoRole.inc:201
 #: ../lib/modules/sudoRole.inc:223 ../lib/modules/sudoRole.inc:283
-#: ../lib/modules/sudoRole.inc:474 ../lib/modules/sudoRole.inc:766
+#: ../lib/modules/sudoRole.inc:474 ../lib/modules/sudoRole.inc:764
 msgid "Not before"
 msgstr "Not before"
 
@@ -8893,9 +8935,9 @@ msgstr ""
 "Note: You may be required to enter new attributes that these object classes "
 "require"
 
-#: ../lib/modules/windowsGroup.inc:124 ../lib/modules/windowsGroup.inc:195
-#: ../lib/modules/windowsGroup.inc:265 ../lib/modules/windowsGroup.inc:356
-#: ../lib/modules/windowsGroup.inc:913
+#: ../lib/modules/windowsGroup.inc:127 ../lib/modules/windowsGroup.inc:198
+#: ../lib/modules/windowsGroup.inc:268 ../lib/modules/windowsGroup.inc:359
+#: ../lib/modules/windowsGroup.inc:914
 msgid "Notes"
 msgstr "Notes"
 
@@ -8908,16 +8950,16 @@ msgid "Notice"
 msgstr "Notice"
 
 #: ../lib/passwordExpirationJob.inc:88 ../lib/passwordExpirationJob.inc:141
-#: ../help/help.inc:334
+#: ../help/help.inc:346
 msgid "Notification period"
 msgstr "Notification period"
 
-#: ../lib/modules/locking389ds.inc:351 ../lib/modules/ppolicyUser.inc:520
-#: ../lib/modules/windowsUser.inc:3401 ../lib/modules/shadowAccount.inc:800
+#: ../lib/modules/locking389ds.inc:351 ../lib/modules/ppolicyUser.inc:518
+#: ../lib/modules/windowsUser.inc:3399 ../lib/modules/shadowAccount.inc:798
 msgid "Notify users about password expiration"
 msgstr "Notify users about password expiration"
 
-#: ../templates/delete.php:110
+#: ../templates/delete.php:116
 msgid "Number of child entries"
 msgstr "Number of child entries"
 
@@ -8986,35 +9028,35 @@ msgstr ""
 msgid "Number of seconds after which the user must change his password."
 msgstr "Number of seconds after which the user must change his password."
 
-#: ../templates/schema/schema.php:147 ../templates/schema/schema.php:344
+#: ../templates/schema/schema.php:148 ../templates/schema/schema.php:345
 msgid "OID"
 msgstr "OID"
 
-#: ../templates/ou_edit.php:87
+#: ../templates/ou_edit.php:97
 msgid "OU already exists!"
 msgstr "OU already exists!"
 
-#: ../templates/ou_edit.php:98
+#: ../templates/ou_edit.php:108
 msgid "OU deleted successfully."
 msgstr "OU deleted successfully."
 
-#: ../templates/ou_edit.php:157 ../lib/tools/ouEditor.inc:44
+#: ../templates/ou_edit.php:167 ../lib/tools/ouEditor.inc:45
 msgid "OU editor"
 msgstr "OU editor"
 
-#: ../templates/ou_edit.php:91
+#: ../templates/ou_edit.php:101
 msgid "OU is invalid!"
 msgstr "OU is invalid!"
 
-#: ../templates/ou_edit.php:136
+#: ../templates/ou_edit.php:146
 msgid "OU is not empty or invalid!"
 msgstr "OU is not empty or invalid!"
 
-#: ../help/help.inc:301 ../help/help.inc:303
+#: ../help/help.inc:313 ../help/help.inc:315
 msgid "OU-Editor"
 msgstr "OU-Editor"
 
-#: ../templates/schema/schema.php:65 ../templates/schema/schema.php:66
+#: ../templates/schema/schema.php:66 ../templates/schema/schema.php:67
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1324
 #: ../lib/modules/selfRegistration.inc:74
 #: ../lib/modules/selfRegistration.inc:219 ../lib/modules/customFields.inc:80
@@ -9022,79 +9064,78 @@ msgstr "OU-Editor"
 msgid "Object classes"
 msgstr "Object classes"
 
-#: ../lib/lists.inc:112
+#: ../lib/lists.inc:114
 #, php-format
 msgid "Object count: %s"
 msgstr "Object count: %s"
 
-#: ../templates/schema/schema.php:152 ../templates/schema/schema.php:283
+#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:284
 msgid "Obsolete"
 msgstr "Obsolete"
 
 #: ../lib/modules/sambaDomain.inc:289 ../lib/modules/sambaDomain.inc:298
-#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:615
-#: ../lib/modules/sambaDomain.inc:620 ../lib/modules/sambaDomain.inc:625
+#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:613
+#: ../lib/modules/sambaDomain.inc:618 ../lib/modules/sambaDomain.inc:623
 msgid "Off"
 msgstr "Off"
 
 #: ../lib/modules/windowsUser.inc:166 ../lib/modules/windowsUser.inc:478
 #: ../lib/modules/windowsUser.inc:825 ../lib/modules/windowsUser.inc:915
-#: ../lib/modules/windowsUser.inc:1098 ../lib/modules/windowsUser.inc:2436
-#: ../lib/modules/windowsUser.inc:2611 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:205 ../lib/modules/inetOrgPerson.inc:548
-#: ../lib/modules/inetOrgPerson.inc:583 ../lib/modules/inetOrgPerson.inc:819
-#: ../lib/modules/inetOrgPerson.inc:823 ../lib/modules/inetOrgPerson.inc:1439
-#: ../lib/modules/inetOrgPerson.inc:1442 ../lib/modules/inetOrgPerson.inc:2004
-#: ../lib/modules/inetOrgPerson.inc:2701 ../lib/modules/inetOrgPerson.inc:3658
-#: ../lib/modules/inetOrgPerson.inc:3719
+#: ../lib/modules/windowsUser.inc:1098 ../lib/modules/windowsUser.inc:2434
+#: ../lib/modules/windowsUser.inc:2609 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:203 ../lib/modules/inetOrgPerson.inc:546
+#: ../lib/modules/inetOrgPerson.inc:581 ../lib/modules/inetOrgPerson.inc:817
+#: ../lib/modules/inetOrgPerson.inc:821 ../lib/modules/inetOrgPerson.inc:1437
+#: ../lib/modules/inetOrgPerson.inc:1440 ../lib/modules/inetOrgPerson.inc:2000
+#: ../lib/modules/inetOrgPerson.inc:2697 ../lib/modules/inetOrgPerson.inc:3638
+#: ../lib/modules/inetOrgPerson.inc:3699
 msgid "Office name"
 msgstr "Office name"
 
-#: ../templates/lists/changePassword.php:353
-#: ../templates/lists/changePassword.php:392
-#: ../templates/lists/changePassword.php:445
-#: ../templates/lists/changePassword.php:481
-#: ../templates/tests/lamdaemonTest.php:92 ../templates/ou_edit.php:198
-#: ../templates/ou_edit.php:212 ../templates/masscreate.php:210
-#: ../templates/config/profmanage.php:260
+#: ../templates/lists/changePassword.php:354
+#: ../templates/lists/changePassword.php:393
+#: ../templates/lists/changePassword.php:446
+#: ../templates/lists/changePassword.php:482
+#: ../templates/tests/lamdaemonTest.php:93 ../templates/ou_edit.php:210
+#: ../templates/ou_edit.php:224 ../templates/config/profmanage.php:260
 #: ../templates/config/profmanage.php:272
 #: ../templates/config/profmanage.php:281
 #: ../templates/config/profmanage.php:299
 #: ../templates/config/profmanage.php:308
 #: ../templates/config/profmanage.php:310
 #: ../templates/config/mainmanage.php:486 ../templates/config/jobList.php:230
-#: ../templates/config/conflogin.php:182 ../templates/config/mainlogin.php:171
+#: ../templates/config/conflogin.php:182 ../templates/config/mainlogin.php:182
 #: ../templates/selfService/profManage.php:210
 #: ../templates/selfService/profManage.php:227
 #: ../templates/selfService/profManage.php:242
 #: ../templates/selfService/adminLogin.php:171
-#: ../templates/selfService/adminMain.php:616
 #: ../templates/selfService/adminMain.php:669
-#: ../templates/pdfedit/pdfmain.php:215 ../templates/pdfedit/pdfmain.php:222
-#: ../templates/pdfedit/pdfmain.php:228
-#: ../templates/profedit/profilemain.php:204
-#: ../templates/profedit/profilemain.php:210
-#: ../templates/profedit/profilemain.php:216
-#: ../lib/types/automountType.inc:234 ../lib/types/user.inc:329
-#: ../lib/types/bind.inc:175 ../lib/modules/selfRegistration.inc:477
+#: ../templates/selfService/adminMain.php:722
+#: ../templates/upload/masscreate.php:235 ../templates/pdfedit/pdfmain.php:260
+#: ../templates/pdfedit/pdfmain.php:267 ../templates/pdfedit/pdfmain.php:273
+#: ../templates/profedit/profilemain.php:245
+#: ../templates/profedit/profilemain.php:251
+#: ../templates/profedit/profilemain.php:257
+#: ../lib/types/automountType.inc:211 ../lib/types/user.inc:329
+#: ../lib/types/bind.inc:152 ../lib/modules/selfRegistration.inc:477
 #: ../lib/modules/zarafaContact.inc:476 ../lib/modules/zarafaGroup.inc:486
-#: ../lib/modules/device.inc:300 ../lib/modules/sambaSamAccount.inc:1380
-#: ../lib/modules/sambaSamAccount.inc:1512 ../lib/modules/zarafaUser.inc:965
-#: ../lib/modules/zarafaUser.inc:1016 ../lib/modules/sambaGroupMapping.inc:508
-#: ../lib/modules/nisnetgroup.inc:479 ../lib/modules/nisnetgroup.inc:489
-#: ../lib/modules/asteriskExtension.inc:484 ../lib/modules/aliasEntry.inc:146
+#: ../lib/modules/device.inc:303 ../lib/modules/sambaSamAccount.inc:1380
+#: ../lib/modules/sambaSamAccount.inc:1512 ../lib/modules/zarafaUser.inc:968
+#: ../lib/modules/zarafaUser.inc:1019 ../lib/modules/sambaGroupMapping.inc:508
+#: ../lib/modules/nisnetgroup.inc:482 ../lib/modules/nisnetgroup.inc:492
+#: ../lib/modules/asteriskExtension.inc:486 ../lib/modules/aliasEntry.inc:146
 #: ../lib/modules/aliasEntry.inc:166 ../lib/modules/qmailGroup.inc:862
-#: ../lib/modules/imapAccess.inc:295 ../lib/modules/organizationalRole.inc:343
-#: ../lib/modules/passwordSelfReset.inc:1075
-#: ../lib/modules/passwordSelfReset.inc:1312
-#: ../lib/modules/windowsGroup.inc:733 ../lib/modules/groupOfNames.inc:402
-#: ../lib/modules/groupOfNames.inc:557 ../lib/modules/nisMailAlias.inc:375
-#: ../lib/modules/nisMailAlias.inc:384 ../lib/lists.inc:728
-#: ../lib/lists.inc:811 ../lib/modules.inc:1253
+#: ../lib/modules/imapAccess.inc:295 ../lib/modules/organizationalRole.inc:346
+#: ../lib/modules/passwordSelfReset.inc:1073
+#: ../lib/modules/passwordSelfReset.inc:1310
+#: ../lib/modules/windowsGroup.inc:736 ../lib/modules/groupOfNames.inc:405
+#: ../lib/modules/groupOfNames.inc:560 ../lib/modules/nisMailAlias.inc:375
+#: ../lib/modules/nisMailAlias.inc:384 ../lib/lists.inc:730
+#: ../lib/lists.inc:812 ../lib/modules.inc:1261
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/modules/posixAccount.inc:2742
+#: ../lib/modules/posixAccount.inc:2740
 msgid "Old password"
 msgstr "Old password"
 
@@ -9104,15 +9145,15 @@ msgid "Old value"
 msgstr "Old value"
 
 #: ../lib/modules/sambaDomain.inc:289 ../lib/modules/sambaDomain.inc:298
-#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:616
-#: ../lib/modules/sambaDomain.inc:621 ../lib/modules/sambaDomain.inc:626
+#: ../lib/modules/sambaDomain.inc:307 ../lib/modules/sambaDomain.inc:614
+#: ../lib/modules/sambaDomain.inc:619 ../lib/modules/sambaDomain.inc:624
 msgid "On"
 msgstr "On"
 
 #: ../lib/modules/sambaSamAccount.inc:244
 #: ../lib/modules/sambaSamAccount.inc:385
 #: ../lib/modules/sambaSamAccount.inc:1498
-#: ../lib/modules/sambaSamAccount.inc:1977
+#: ../lib/modules/sambaSamAccount.inc:1975
 msgid "On broken or timed out connection"
 msgstr "On broken or timed out connection"
 
@@ -9121,7 +9162,7 @@ msgstr "On broken or timed out connection"
 msgid "One (one level beneath base)"
 msgstr "One (one level beneath base)"
 
-#: ../lib/modules/range.inc:135 ../lib/modules/fixed_ip.inc:127
+#: ../lib/modules/range.inc:138 ../lib/modules/fixed_ip.inc:130
 msgid "One or more errors occured. The invalid fields are marked."
 msgstr "One or more errors occured. The invalid fields are marked."
 
@@ -9131,7 +9172,7 @@ msgstr "One or more errors occured. The invalid fields are marked."
 msgid "Operation not successful. DN <b>%s</b> has not been created."
 msgstr "Operation not successful. DN <b>%s</b> has not been created."
 
-#: ../templates/serverInfo.php:277 ../templates/serverInfo.php:367
+#: ../templates/serverInfo.php:278 ../templates/serverInfo.php:368
 msgid "Operation statistics"
 msgstr "Operation statistics"
 
@@ -9141,34 +9182,39 @@ msgstr "Operation statistics"
 msgid "Operation successful. DN <b>%s</b> has been created."
 msgstr "Operation successful. DN <b>%s</b> has been created."
 
-#: ../templates/multiEdit.php:121 ../help/help.inc:311
+#: ../templates/multiEdit.php:144 ../help/help.inc:323
 msgid "Operations"
 msgstr "Operations"
 
-#: ../templates/schema/schema.php:384
+#: ../templates/config/confmain.php:552
+#: ../templates/selfService/adminMain.php:524 ../help/help.inc:292
+msgid "Optional"
+msgstr "Optional"
+
+#: ../templates/schema/schema.php:385
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1575
 msgid "Optional attributes"
 msgstr "Optional attributes"
 
-#: ../lib/modules/fixed_ip.inc:111
+#: ../lib/modules/fixed_ip.inc:114
 msgid "Optional description for the PC."
 msgstr "Optional description for the PC."
 
 #: ../lib/types/sudo.inc:83 ../lib/modules/mitKerberos.inc:408
 #: ../lib/modules/zarafaDynamicGroup.inc:267
 #: ../lib/modules/zarafaContact.inc:268 ../lib/modules/zarafaGroup.inc:268
-#: ../lib/modules/posixAccount.inc:1965 ../lib/modules/zarafaUser.inc:600
-#: ../lib/modules/kolabUser.inc:379 ../lib/modules/sudoRole.inc:94
+#: ../lib/modules/posixAccount.inc:1963 ../lib/modules/zarafaUser.inc:603
+#: ../lib/modules/kolabUser.inc:382 ../lib/modules/sudoRole.inc:94
 #: ../lib/modules/sudoRole.inc:123 ../lib/modules/sudoRole.inc:189
 #: ../lib/modules/sudoRole.inc:221 ../lib/modules/sudoRole.inc:233
-#: ../lib/modules/sudoRole.inc:451 ../lib/modules/sudoRole.inc:760
-#: ../lib/modules/asteriskExtension.inc:122
+#: ../lib/modules/sudoRole.inc:451 ../lib/modules/sudoRole.inc:758
+#: ../lib/modules/asteriskExtension.inc:124
 #: ../lib/modules/asteriskVoicemail.inc:115
 #: ../lib/modules/asteriskVoicemail.inc:125
 #: ../lib/modules/asteriskVoicemail.inc:142
 #: ../lib/modules/asteriskVoicemail.inc:190
 #: ../lib/modules/asteriskVoicemail.inc:258
-#: ../lib/modules/asteriskVoicemail.inc:378 ../lib/modules/qmailGroup.inc:611
+#: ../lib/modules/asteriskVoicemail.inc:376 ../lib/modules/qmailGroup.inc:611
 #: ../lib/modules/heimdalKerberos.inc:339
 msgid "Options"
 msgstr "Options"
@@ -9195,7 +9241,7 @@ msgstr "Oracle databases"
 
 #: ../lib/modules/sudoRole.inc:138 ../lib/modules/sudoRole.inc:207
 #: ../lib/modules/sudoRole.inc:224 ../lib/modules/sudoRole.inc:285
-#: ../lib/modules/sudoRole.inc:484 ../lib/modules/sudoRole.inc:761
+#: ../lib/modules/sudoRole.inc:484 ../lib/modules/sudoRole.inc:759
 msgid "Order"
 msgstr "Order"
 
@@ -9203,43 +9249,43 @@ msgstr "Order"
 msgid "Order by"
 msgstr "Order by"
 
-#: ../templates/schema/schema.php:171
+#: ../templates/schema/schema.php:172
 msgid "Ordering"
 msgstr "Ordering"
 
 #: ../lib/types/user.inc:105 ../lib/modules/eduPerson.inc:126
 #: ../lib/modules/eduPerson.inc:200 ../lib/modules/eduPerson.inc:227
 #: ../lib/modules/eduPerson.inc:245 ../lib/modules/eduPerson.inc:346
-#: ../lib/modules/eduPerson.inc:564 ../lib/modules/windowsUser.inc:338
+#: ../lib/modules/eduPerson.inc:562 ../lib/modules/windowsUser.inc:338
 #: ../lib/modules/windowsUser.inc:342 ../lib/modules/windowsUser.inc:726
 #: ../lib/modules/windowsUser.inc:762 ../lib/modules/windowsUser.inc:889
-#: ../lib/modules/windowsUser.inc:1153 ../lib/modules/windowsUser.inc:2461
-#: ../lib/modules/windowsUser.inc:3229 ../lib/modules/inetOrgPerson.inc:229
-#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:628
-#: ../lib/modules/inetOrgPerson.inc:852 ../lib/modules/inetOrgPerson.inc:856
-#: ../lib/modules/inetOrgPerson.inc:1588 ../lib/modules/inetOrgPerson.inc:1591
-#: ../lib/modules/inetOrgPerson.inc:2009 ../lib/modules/inetOrgPerson.inc:3688
-#: ../lib/modules/inetOrgPerson.inc:3727
+#: ../lib/modules/windowsUser.inc:1153 ../lib/modules/windowsUser.inc:2459
+#: ../lib/modules/windowsUser.inc:3227 ../lib/modules/inetOrgPerson.inc:227
+#: ../lib/modules/inetOrgPerson.inc:514 ../lib/modules/inetOrgPerson.inc:626
+#: ../lib/modules/inetOrgPerson.inc:850 ../lib/modules/inetOrgPerson.inc:854
+#: ../lib/modules/inetOrgPerson.inc:1586 ../lib/modules/inetOrgPerson.inc:1589
+#: ../lib/modules/inetOrgPerson.inc:2005 ../lib/modules/inetOrgPerson.inc:3668
+#: ../lib/modules/inetOrgPerson.inc:3707
 msgid "Organisation"
 msgstr "Organization"
 
 #: ../lib/types/user.inc:106 ../lib/modules/windowsUser.inc:330
 #: ../lib/modules/windowsUser.inc:334 ../lib/modules/windowsUser.inc:718
 #: ../lib/modules/windowsUser.inc:759 ../lib/modules/windowsUser.inc:886
-#: ../lib/modules/windowsUser.inc:1150 ../lib/modules/windowsUser.inc:2460
-#: ../lib/modules/windowsUser.inc:3228 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:226 ../lib/modules/inetOrgPerson.inc:508
-#: ../lib/modules/inetOrgPerson.inc:631 ../lib/modules/inetOrgPerson.inc:844
-#: ../lib/modules/inetOrgPerson.inc:848 ../lib/modules/inetOrgPerson.inc:1579
-#: ../lib/modules/inetOrgPerson.inc:1582 ../lib/modules/inetOrgPerson.inc:2008
-#: ../lib/modules/inetOrgPerson.inc:2831 ../lib/modules/inetOrgPerson.inc:3686
-#: ../lib/modules/inetOrgPerson.inc:3727
+#: ../lib/modules/windowsUser.inc:1150 ../lib/modules/windowsUser.inc:2458
+#: ../lib/modules/windowsUser.inc:3226 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:224 ../lib/modules/inetOrgPerson.inc:506
+#: ../lib/modules/inetOrgPerson.inc:629 ../lib/modules/inetOrgPerson.inc:842
+#: ../lib/modules/inetOrgPerson.inc:846 ../lib/modules/inetOrgPerson.inc:1577
+#: ../lib/modules/inetOrgPerson.inc:1580 ../lib/modules/inetOrgPerson.inc:2004
+#: ../lib/modules/inetOrgPerson.inc:2833 ../lib/modules/inetOrgPerson.inc:3666
+#: ../lib/modules/inetOrgPerson.inc:3707
 msgid "Organisational unit"
 msgstr "Organizational unit"
 
 #: ../lib/modules/eduPerson.inc:134 ../lib/modules/eduPerson.inc:138
 #: ../lib/modules/eduPerson.inc:212 ../lib/modules/eduPerson.inc:228
-#: ../lib/modules/eduPerson.inc:350 ../lib/modules/eduPerson.inc:566
+#: ../lib/modules/eduPerson.inc:350 ../lib/modules/eduPerson.inc:564
 msgid "Organisational units"
 msgstr "Organizational units"
 
@@ -9247,34 +9293,34 @@ msgstr "Organizational units"
 msgid "Organisational units contains an invalid entry."
 msgstr "Organizational units contains an invalid entry."
 
-#: ../templates/multiEdit.php:102 ../templates/config/confmain.php:366
+#: ../templates/multiEdit.php:125 ../templates/config/confmain.php:369
 msgid "Other"
 msgstr "Other"
 
 #: ../lib/modules/windowsUser.inc:370 ../lib/modules/windowsUser.inc:374
 #: ../lib/modules/windowsUser.inc:629 ../lib/modules/windowsUser.inc:907
 #: ../lib/modules/windowsUser.inc:974 ../lib/modules/windowsUser.inc:1112
-#: ../lib/modules/windowsUser.inc:2448 ../lib/modules/windowsUser.inc:3212
+#: ../lib/modules/windowsUser.inc:2446 ../lib/modules/windowsUser.inc:3210
 msgid "Other mobiles"
 msgstr "Other mobiles"
 
 #: ../lib/modules/windowsUser.inc:358 ../lib/modules/windowsUser.inc:362
 #: ../lib/modules/windowsUser.inc:613 ../lib/modules/windowsUser.inc:901
 #: ../lib/modules/windowsUser.inc:970 ../lib/modules/windowsUser.inc:1118
-#: ../lib/modules/windowsUser.inc:2446 ../lib/modules/windowsUser.inc:3214
+#: ../lib/modules/windowsUser.inc:2444 ../lib/modules/windowsUser.inc:3212
 msgid "Other pagers"
 msgstr "Other pagers"
 
 #: ../lib/modules/windowsUser.inc:158 ../lib/modules/windowsUser.inc:162
 #: ../lib/modules/windowsUser.inc:502 ../lib/modules/windowsUser.inc:824
 #: ../lib/modules/windowsUser.inc:966 ../lib/modules/windowsUser.inc:1107
-#: ../lib/modules/windowsUser.inc:2435
+#: ../lib/modules/windowsUser.inc:2433
 msgid "Other telephone numbers"
 msgstr "Other telephone numbers"
 
 #: ../lib/modules/windowsUser.inc:198 ../lib/modules/windowsUser.inc:202
 #: ../lib/modules/windowsUser.inc:514 ../lib/modules/windowsUser.inc:832
-#: ../lib/modules/windowsUser.inc:1124 ../lib/modules/windowsUser.inc:2450
+#: ../lib/modules/windowsUser.inc:1124 ../lib/modules/windowsUser.inc:2448
 msgid "Other web sites"
 msgstr "Other web sites"
 
@@ -9288,14 +9334,14 @@ msgstr "Output may contain HTML"
 msgid "Output of command \"%s\" with return code %s"
 msgstr "Output of command \"%s\" with return code %s"
 
-#: ../lib/modules/pykotaUser.inc:144 ../lib/modules/pykotaUser.inc:171
-#: ../lib/modules/pykotaUser.inc:253 ../lib/modules/pykotaUser.inc:263
-#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:402
-#: ../lib/modules/pykotaUser.inc:902
+#: ../lib/modules/pykotaUser.inc:147 ../lib/modules/pykotaUser.inc:174
+#: ../lib/modules/pykotaUser.inc:256 ../lib/modules/pykotaUser.inc:266
+#: ../lib/modules/pykotaUser.inc:327 ../lib/modules/pykotaUser.inc:405
+#: ../lib/modules/pykotaUser.inc:903
 msgid "Overcharge factor"
 msgstr "Overcharge factor"
 
-#: ../lib/modules/pykotaUser.inc:145
+#: ../lib/modules/pykotaUser.inc:148
 msgid ""
 "Overcharge factor that is applied when computing the cost of a print job. "
 "The number of pages is not changed."
@@ -9303,27 +9349,27 @@ msgstr ""
 "Overcharge factor that is applied when computing the cost of a print job. "
 "The number of pages is not changed."
 
-#: ../templates/serverInfo.php:168
+#: ../templates/serverInfo.php:169
 msgid "Overlays"
 msgstr "Overlays"
 
-#: ../lib/modules/zarafaUser.inc:103
+#: ../lib/modules/zarafaUser.inc:106
 msgid "Override default quota settings."
 msgstr "Override default quota settings."
 
-#: ../templates/config/confmain.php:358 ../lib/types/asteriskExt.inc:96
+#: ../templates/config/confmain.php:361 ../lib/types/asteriskExt.inc:96
 #: ../lib/types/asteriskExt.inc:158
 msgid "Owner"
 msgstr "Owner"
 
-#: ../lib/types/gon.inc:108 ../lib/modules/device.inc:69
-#: ../lib/modules/device.inc:73 ../lib/modules/device.inc:103
-#: ../lib/modules/device.inc:128 ../lib/modules/device.inc:180
-#: ../lib/modules/device.inc:415 ../lib/modules/groupOfNames.inc:93
-#: ../lib/modules/groupOfNames.inc:97 ../lib/modules/groupOfNames.inc:143
-#: ../lib/modules/groupOfNames.inc:174 ../lib/modules/groupOfNames.inc:199
-#: ../lib/modules/groupOfNames.inc:242 ../lib/modules/groupOfNames.inc:406
-#: ../lib/modules/groupOfNames.inc:757
+#: ../lib/types/gon.inc:108 ../lib/modules/device.inc:72
+#: ../lib/modules/device.inc:76 ../lib/modules/device.inc:106
+#: ../lib/modules/device.inc:131 ../lib/modules/device.inc:183
+#: ../lib/modules/device.inc:416 ../lib/modules/groupOfNames.inc:96
+#: ../lib/modules/groupOfNames.inc:100 ../lib/modules/groupOfNames.inc:146
+#: ../lib/modules/groupOfNames.inc:177 ../lib/modules/groupOfNames.inc:202
+#: ../lib/modules/groupOfNames.inc:245 ../lib/modules/groupOfNames.inc:409
+#: ../lib/modules/groupOfNames.inc:758
 msgid "Owners"
 msgstr "Owners"
 
@@ -9331,8 +9377,8 @@ msgstr "Owners"
 msgid "P-Node (0x02)"
 msgstr "P-Node (0x02)"
 
-#: ../lib/modules/fixed_ip.inc:98 ../lib/modules/fixed_ip.inc:425
-#: ../lib/modules/fixed_ip.inc:741
+#: ../lib/modules/fixed_ip.inc:101 ../lib/modules/fixed_ip.inc:428
+#: ../lib/modules/fixed_ip.inc:742
 msgid "PC name"
 msgstr "PC name"
 
@@ -9340,29 +9386,29 @@ msgstr "PC name"
 msgid "PC01"
 msgstr "PC01"
 
-#: ../templates/pdfedit/pdfpage.php:449 ../templates/pdfedit/pdfmain.php:88
-#: ../lib/tools/pdfEdit.inc:44
+#: ../templates/pdfedit/pdfpage.php:464 ../templates/pdfedit/pdfmain.php:105
+#: ../lib/tools/pdfEdit.inc:45
 msgid "PDF editor"
 msgstr "PDF editor"
 
-#: ../templates/masscreate.php:275 ../templates/pdfedit/pdfmain.php:316
-#: ../lib/lists.inc:706 ../help/help.inc:242
+#: ../templates/upload/masscreate.php:301 ../lib/lists.inc:708
+#: ../help/help.inc:242
 msgid "PDF structure"
 msgstr "PDF structure"
 
-#: ../templates/pdfedit/pdfpage.php:112
+#: ../templates/pdfedit/pdfpage.php:130
 msgid "PDF structure name not valid"
 msgstr "PDF structure name not valid"
 
-#: ../templates/pdfedit/pdfmain.php:173
+#: ../templates/pdfedit/pdfmain.php:220
 msgid "PDF structure was successfully saved."
 msgstr "PDF structure was successfully saved."
 
-#: ../templates/pdfedit/pdfmain.php:282
+#: ../templates/pdfedit/pdfmain.php:334
 msgid "PDF structures"
 msgstr "PDF structures"
 
-#: ../templates/serverInfo.php:264
+#: ../templates/serverInfo.php:265
 msgid "PDUs sent"
 msgstr "PDUs sent"
 
@@ -9374,24 +9420,29 @@ msgstr "PHP error reporting"
 msgid "PHP system setting"
 msgstr "PHP system setting"
 
-#: ../lib/modules/zarafaUser.inc:326 ../lib/modules/zarafaUser.inc:676
-#: ../lib/modules/zarafaUser.inc:1375
+#: ../templates/selfService/selfService2Factor.php:61
+#: ../templates/login2Factor.php:69
+msgid "PIN+Token"
+msgstr "PIN+Token"
+
+#: ../lib/modules/zarafaUser.inc:329 ../lib/modules/zarafaUser.inc:679
+#: ../lib/modules/zarafaUser.inc:1376
 msgid "POP3"
 msgstr "POP3"
 
-#: ../templates/lists/changePassword.php:425
-#: ../templates/lists/changePassword.php:465 ../lib/types/user.inc:406
-#: ../lib/types/user.inc:445 ../lib/modules/ppolicyUser.inc:520
+#: ../templates/lists/changePassword.php:426
+#: ../templates/lists/changePassword.php:466 ../lib/types/user.inc:406
+#: ../lib/types/user.inc:445 ../lib/modules/ppolicyUser.inc:518
 msgid "PPolicy"
 msgstr "PPolicy"
 
-#: ../lib/modules/bindDLZ.inc:115 ../lib/modules/bindDLZ.inc:301
-#: ../lib/modules/bindDLZ.inc:307 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:118 ../lib/modules/bindDLZ.inc:304
+#: ../lib/modules/bindDLZ.inc:310 ../lib/modules/bindDLZ.inc:488
 msgid "PTR record"
 msgstr "PTR record"
 
-#: ../lib/modules/bindDLZ.inc:422 ../lib/modules/bindDLZ.inc:441
-#: ../lib/modules/bindDLZ.inc:1496
+#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:444
+#: ../lib/modules/bindDLZ.inc:1497
 msgid "PTR records"
 msgstr "PTR records"
 
@@ -9407,37 +9458,37 @@ msgstr ""
 #: ../lib/modules/pykotaBillingCode.inc:89
 #: ../lib/modules/pykotaBillingCode.inc:118
 #: ../lib/modules/pykotaBillingCode.inc:151
-#: ../lib/modules/pykotaBillingCode.inc:267
+#: ../lib/modules/pykotaBillingCode.inc:265
 msgid "Page count"
 msgstr "Page count"
 
-#: ../templates/selfService/adminMain.php:511 ../help/help.inc:272
+#: ../templates/selfService/adminMain.php:564 ../help/help.inc:272
 msgid "Page header"
 msgstr "Page header"
 
-#: ../templates/selfService/adminMain.php:406
+#: ../templates/selfService/adminMain.php:422
 msgid "Page layout"
 msgstr "Page layout"
 
-#: ../templates/config/confmain.php:290 ../help/help.inc:186
+#: ../templates/config/confmain.php:293 ../help/help.inc:186
 msgid "Paged results"
 msgstr "Paged results"
 
 #: ../lib/modules/windowsUser.inc:354 ../lib/modules/windowsUser.inc:605
 #: ../lib/modules/windowsUser.inc:898 ../lib/modules/windowsUser.inc:968
-#: ../lib/modules/windowsUser.inc:1115 ../lib/modules/windowsUser.inc:2445
-#: ../lib/modules/windowsUser.inc:3213 ../lib/modules/inetOrgPerson.inc:78
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:458
-#: ../lib/modules/inetOrgPerson.inc:601 ../lib/modules/inetOrgPerson.inc:740
-#: ../lib/modules/inetOrgPerson.inc:744 ../lib/modules/inetOrgPerson.inc:1495
-#: ../lib/modules/inetOrgPerson.inc:1498 ../lib/modules/inetOrgPerson.inc:1995
-#: ../lib/modules/inetOrgPerson.inc:2591 ../lib/modules/inetOrgPerson.inc:3670
-#: ../lib/modules/inetOrgPerson.inc:3722
+#: ../lib/modules/windowsUser.inc:1115 ../lib/modules/windowsUser.inc:2443
+#: ../lib/modules/windowsUser.inc:3211 ../lib/modules/inetOrgPerson.inc:76
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:456
+#: ../lib/modules/inetOrgPerson.inc:599 ../lib/modules/inetOrgPerson.inc:738
+#: ../lib/modules/inetOrgPerson.inc:742 ../lib/modules/inetOrgPerson.inc:1493
+#: ../lib/modules/inetOrgPerson.inc:1496 ../lib/modules/inetOrgPerson.inc:1991
+#: ../lib/modules/inetOrgPerson.inc:2587 ../lib/modules/inetOrgPerson.inc:3650
+#: ../lib/modules/inetOrgPerson.inc:3702
 #: ../lib/modules/asteriskVoicemail.inc:111
 #: ../lib/modules/asteriskVoicemail.inc:141
 #: ../lib/modules/asteriskVoicemail.inc:184
 #: ../lib/modules/asteriskVoicemail.inc:256
-#: ../lib/modules/asteriskVoicemail.inc:376
+#: ../lib/modules/asteriskVoicemail.inc:374
 msgid "Pager"
 msgstr "Pager"
 
@@ -9449,17 +9500,17 @@ msgstr "Pager number for Asterisk voicemail."
 msgid "Parent DN"
 msgstr "Parent DN"
 
-#: ../lib/modules/puppetClient.inc:93 ../lib/modules/puppetClient.inc:143
-#: ../lib/modules/puppetClient.inc:164 ../lib/modules/puppetClient.inc:277
-#: ../lib/modules/puppetClient.inc:409 ../lib/modules/puppetClient.inc:452
+#: ../lib/modules/puppetClient.inc:96 ../lib/modules/puppetClient.inc:146
+#: ../lib/modules/puppetClient.inc:167 ../lib/modules/puppetClient.inc:280
+#: ../lib/modules/puppetClient.inc:410 ../lib/modules/puppetClient.inc:453
 msgid "Parent node"
 msgstr "Parent node"
 
-#: ../lib/modules/puppetClient.inc:201
+#: ../lib/modules/puppetClient.inc:204
 msgid "Parent node not found."
 msgstr "Parent node not found."
 
-#: ../templates/schema/schema.php:366
+#: ../templates/schema/schema.php:367
 msgid "Parent to"
 msgstr "Parent to"
 
@@ -9473,44 +9524,44 @@ msgstr "Partially locked"
 
 #: ../lib/modules/pykotaPrinter.inc:107 ../lib/modules/pykotaPrinter.inc:166
 #: ../lib/modules/pykotaPrinter.inc:196 ../lib/modules/pykotaPrinter.inc:243
-#: ../lib/modules/pykotaPrinter.inc:598
+#: ../lib/modules/pykotaPrinter.inc:596
 msgid "Passthrough"
 msgstr "Passthrough"
 
-#: ../templates/lists/changePassword.php:371 ../templates/login.php:391
-#: ../templates/selfService/selfServiceLogin.php:339
-#: ../lib/selfService.inc:406 ../lib/modules/mitKerberos.inc:156
+#: ../templates/lists/changePassword.php:372 ../templates/login.php:399
+#: ../templates/selfService/selfServiceLogin.php:355
+#: ../lib/selfService.inc:416 ../lib/modules/mitKerberos.inc:156
 #: ../lib/modules/mitKerberos.inc:242 ../lib/modules/mitKerberos.inc:257
-#: ../lib/modules/mitKerberos.inc:809 ../lib/modules/mitKerberos.inc:812
+#: ../lib/modules/mitKerberos.inc:807 ../lib/modules/mitKerberos.inc:810
 #: ../lib/modules/selfRegistration.inc:428
 #: ../lib/modules/selfRegistration.inc:582
 #: ../lib/modules/selfRegistration.inc:585
 #: ../lib/modules/selfRegistration.inc:588
 #: ../lib/modules/asteriskAccount.inc:115
 #: ../lib/modules/asteriskAccount.inc:325 ../lib/modules/posixGroup.inc:202
-#: ../lib/modules/posixGroup.inc:658 ../lib/modules/sambaSamAccount.inc:105
+#: ../lib/modules/posixGroup.inc:656 ../lib/modules/sambaSamAccount.inc:105
 #: ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:251
 #: ../lib/modules/sambaSamAccount.inc:432 ../lib/modules/posixAccount.inc:109
 #: ../lib/modules/posixAccount.inc:110 ../lib/modules/posixAccount.inc:187
 #: ../lib/modules/posixAccount.inc:273 ../lib/modules/posixAccount.inc:359
 #: ../lib/modules/posixAccount.inc:477 ../lib/modules/posixAccount.inc:1481
-#: ../lib/modules/posixAccount.inc:1866 ../lib/modules/posixAccount.inc:1869
+#: ../lib/modules/posixAccount.inc:1864 ../lib/modules/posixAccount.inc:1867
 #: ../lib/modules/windowsUser.inc:239 ../lib/modules/windowsUser.inc:406
 #: ../lib/modules/windowsUser.inc:841 ../lib/modules/windowsUser.inc:924
 #: ../lib/modules/windowsUser.inc:986 ../lib/modules/windowsUser.inc:987
-#: ../lib/modules/windowsUser.inc:2495 ../lib/modules/windowsUser.inc:2498
-#: ../lib/modules/inetOrgPerson.inc:646 ../lib/modules/inetOrgPerson.inc:868
-#: ../lib/modules/inetOrgPerson.inc:1645 ../lib/modules/inetOrgPerson.inc:2014
-#: ../lib/modules/inetOrgPerson.inc:2017 ../lib/modules/inetOrgPerson.inc:2151
-#: ../lib/modules/inetOrgPerson.inc:3729
+#: ../lib/modules/windowsUser.inc:2493 ../lib/modules/windowsUser.inc:2496
+#: ../lib/modules/inetOrgPerson.inc:644 ../lib/modules/inetOrgPerson.inc:866
+#: ../lib/modules/inetOrgPerson.inc:1643 ../lib/modules/inetOrgPerson.inc:2010
+#: ../lib/modules/inetOrgPerson.inc:2013 ../lib/modules/inetOrgPerson.inc:2147
+#: ../lib/modules/inetOrgPerson.inc:3709
 #: ../lib/modules/asteriskVoicemail.inc:99
 #: ../lib/modules/asteriskVoicemail.inc:165
-#: ../lib/modules/customFields.inc:2560 ../lib/modules/heimdalKerberos.inc:124
+#: ../lib/modules/customFields.inc:2558 ../lib/modules/heimdalKerberos.inc:124
 #: ../lib/modules/heimdalKerberos.inc:211
 #: ../lib/modules/heimdalKerberos.inc:223
-#: ../lib/modules/heimdalKerberos.inc:709
-#: ../lib/modules/heimdalKerberos.inc:712 ../lib/modules.inc:1067
+#: ../lib/modules/heimdalKerberos.inc:707
+#: ../lib/modules/heimdalKerberos.inc:710 ../lib/modules.inc:1075
 #: ../help/help.inc:240
 msgid "Password"
 msgstr "Password"
@@ -9518,7 +9569,7 @@ msgstr "Password"
 #: ../lib/modules/sambaSamAccount.inc:295
 #: ../lib/modules/sambaSamAccount.inc:1105 ../lib/modules/windowsUser.inc:230
 #: ../lib/modules/windowsUser.inc:550 ../lib/modules/windowsUser.inc:839
-#: ../lib/modules/windowsUser.inc:2483
+#: ../lib/modules/windowsUser.inc:2481
 msgid "Password change at next login"
 msgstr "Password change at next login"
 
@@ -9528,7 +9579,7 @@ msgstr "Password change at next login"
 msgid "Password change command"
 msgstr "Password change command"
 
-#: ../templates/lists/changePassword.php:303
+#: ../templates/lists/changePassword.php:304
 msgid "Password change options"
 msgstr "Password change options"
 
@@ -9539,7 +9590,7 @@ msgstr "Password change required"
 
 #: ../lib/types/ppolicyType.inc:91 ../lib/modules/ppolicy.inc:136
 #: ../lib/modules/ppolicy.inc:156 ../lib/modules/ppolicy.inc:295
-#: ../lib/modules/ppolicy.inc:511
+#: ../lib/modules/ppolicy.inc:509
 msgid "Password change requires old password"
 msgstr "Password change requires old password"
 
@@ -9558,10 +9609,10 @@ msgid "Password check"
 msgstr "Password check"
 
 #: ../lib/modules/mitKerberos.inc:297 ../lib/modules/selfRegistration.inc:585
-#: ../lib/modules/posixGroup.inc:658 ../lib/modules/sambaSamAccount.inc:106
+#: ../lib/modules/posixGroup.inc:656 ../lib/modules/sambaSamAccount.inc:106
 #: ../lib/modules/sambaSamAccount.inc:107 ../lib/modules/posixAccount.inc:110
 #: ../lib/modules/posixAccount.inc:111 ../lib/modules/windowsUser.inc:987
-#: ../lib/modules/inetOrgPerson.inc:107
+#: ../lib/modules/inetOrgPerson.inc:105
 msgid "Password contains invalid characters. Valid characters are:"
 msgstr "Password contains invalid characters. Valid characters are:"
 
@@ -9571,7 +9622,7 @@ msgstr "Password contains invalid characters. Valid characters are:"
 #: ../lib/modules/sambaSamAccount.inc:1095
 #: ../lib/modules/sambaSamAccount.inc:1685 ../lib/modules/windowsUser.inc:216
 #: ../lib/modules/windowsUser.inc:528 ../lib/modules/windowsUser.inc:835
-#: ../lib/modules/windowsUser.inc:1191 ../lib/modules/windowsUser.inc:2472
+#: ../lib/modules/windowsUser.inc:1191 ../lib/modules/windowsUser.inc:2470
 msgid "Password does not expire"
 msgstr "Password does not expire"
 
@@ -9579,7 +9630,7 @@ msgstr "Password does not expire"
 #: ../lib/modules/locking389ds.inc:115 ../lib/modules/shadowAccount.inc:61
 #: ../lib/modules/shadowAccount.inc:113 ../lib/modules/shadowAccount.inc:181
 #: ../lib/modules/shadowAccount.inc:215 ../lib/modules/shadowAccount.inc:324
-#: ../lib/modules/shadowAccount.inc:571
+#: ../lib/modules/shadowAccount.inc:569
 msgid "Password expiration"
 msgstr "Password expiration"
 
@@ -9587,7 +9638,7 @@ msgstr "Password expiration"
 msgid "Password expiration must be are natural number or -1."
 msgstr "Password expiration must be are natural number or -1."
 
-#: ../templates/selfService/adminMain.php:495 ../help/help.inc:276
+#: ../templates/selfService/adminMain.php:548 ../help/help.inc:276
 msgid "Password field label"
 msgstr "Password field label"
 
@@ -9597,27 +9648,27 @@ msgstr "Password for voicemail mailbox."
 
 #: ../lib/modules/posixGroup.inc:500 ../lib/modules/posixGroup.inc:610
 #: ../lib/modules/posixAccount.inc:197 ../lib/modules/posixAccount.inc:398
-#: ../lib/modules/posixAccount.inc:1967 ../lib/modules/inetOrgPerson.inc:839
-#: ../lib/modules/inetOrgPerson.inc:3633 ../lib/modules/customFields.inc:140
-#: ../lib/modules/customFields.inc:2574
+#: ../lib/modules/posixAccount.inc:1965 ../lib/modules/inetOrgPerson.inc:837
+#: ../lib/modules/inetOrgPerson.inc:3613 ../lib/modules/customFields.inc:140
+#: ../lib/modules/customFields.inc:2572
 msgid "Password hash type"
 msgstr "Password hash type"
 
 #: ../lib/modules/sambaSamAccount.inc:409
 #: ../lib/modules/sambaSamAccount.inc:1867
-#: ../lib/modules/sambaSamAccount.inc:2285
+#: ../lib/modules/sambaSamAccount.inc:2283
 msgid "Password history"
 msgstr "Password history"
 
 #: ../lib/types/ppolicyType.inc:80 ../lib/modules/ppolicy.inc:92
 #: ../lib/modules/ppolicy.inc:145 ../lib/modules/ppolicy.inc:169
-#: ../lib/modules/ppolicy.inc:227 ../lib/modules/ppolicy.inc:475
+#: ../lib/modules/ppolicy.inc:227 ../lib/modules/ppolicy.inc:473
 #: ../lib/modules/sambaDomain.inc:105 ../lib/modules/sambaDomain.inc:191
-#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:607
+#: ../lib/modules/sambaDomain.inc:283 ../lib/modules/sambaDomain.inc:605
 msgid "Password history length"
 msgstr "Password history length"
 
-#: ../templates/config/confmain.php:444
+#: ../templates/config/confmain.php:447
 msgid "Password mail settings"
 msgstr "Password mail settings"
 
@@ -9664,7 +9715,7 @@ msgstr "Password policies (ppolicy)"
 #: ../lib/types/user.inc:979 ../lib/modules/ppolicyUser.inc:45
 #: ../lib/modules/ppolicyUser.inc:56 ../lib/modules/ppolicyUser.inc:72
 #: ../lib/modules/ppolicyUser.inc:88 ../lib/modules/ppolicyUser.inc:128
-#: ../lib/modules/ppolicyUser.inc:263 ../lib/modules/ppolicyUser.inc:297
+#: ../lib/modules/ppolicyUser.inc:263 ../lib/modules/ppolicyUser.inc:295
 #: ../lib/modules/ppolicy.inc:62 ../lib/modules/sambaDomain.inc:266
 #: ../help/help.inc:156
 msgid "Password policy"
@@ -9672,29 +9723,29 @@ msgstr "Password policy"
 
 #: ../lib/types/ppolicyType.inc:81 ../lib/modules/ppolicy.inc:96
 #: ../lib/modules/ppolicy.inc:146 ../lib/modules/ppolicy.inc:239
-#: ../lib/modules/ppolicy.inc:491
+#: ../lib/modules/ppolicy.inc:489
 msgid "Password quality check"
 msgstr "Password quality check"
 
-#: ../lib/modules/passwordSelfReset.inc:681
+#: ../lib/modules/passwordSelfReset.inc:679
 msgid "Password reset confirmation"
 msgstr "Password reset confirmation"
 
-#: ../lib/modules/passwordSelfReset.inc:701
+#: ../lib/modules/passwordSelfReset.inc:699
 msgid "Password reset notification"
 msgstr "Password reset notification"
 
-#: ../templates/config/confmain.php:413
+#: ../templates/config/confmain.php:416
 msgid "Password reset page settings"
 msgstr "Password reset page settings"
 
 #: ../lib/modules/passwordSelfReset.inc:66
-#: ../lib/modules/passwordSelfReset.inc:1029
-#: ../lib/modules/passwordSelfReset.inc:1212
+#: ../lib/modules/passwordSelfReset.inc:1027
+#: ../lib/modules/passwordSelfReset.inc:1210
 msgid "Password self reset"
 msgstr "Password self reset"
 
-#: ../lib/modules/passwordSelfReset.inc:1853
+#: ../lib/modules/passwordSelfReset.inc:1851
 msgid "Password successfully reset."
 msgstr "Password successfully reset."
 
@@ -9705,7 +9756,7 @@ msgstr "Password to unlock SSH key file."
 #: ../lib/modules/shadowAccount.inc:63 ../lib/modules/shadowAccount.inc:108
 #: ../lib/modules/shadowAccount.inc:168 ../lib/modules/shadowAccount.inc:177
 #: ../lib/modules/shadowAccount.inc:209 ../lib/modules/shadowAccount.inc:316
-#: ../lib/modules/shadowAccount.inc:570
+#: ../lib/modules/shadowAccount.inc:568
 msgid "Password warning"
 msgstr "Password warning"
 
@@ -9713,9 +9764,9 @@ msgstr "Password warning"
 msgid "Password warning must be are natural number."
 msgstr "Password warning must be are natural number."
 
-#: ../templates/config/confmain.php:717
+#: ../templates/config/confmain.php:763
 #: ../templates/3rdParty/pla/htdocs/password_checker.php:61
-#: ../lib/modules/passwordSelfReset.inc:1410 ../lib/modules.inc:1157
+#: ../lib/modules/passwordSelfReset.inc:1408 ../lib/modules.inc:1165
 msgid "Passwords are different!"
 msgstr "Passwords are different!"
 
@@ -9757,7 +9808,7 @@ msgstr ""
 "authentication with the person's password who is logged into LAM will be "
 "used."
 
-#: ../templates/config/confmain.php:342
+#: ../templates/config/confmain.php:345
 msgid "Path to external script"
 msgstr "Path to external script"
 
@@ -9777,26 +9828,26 @@ msgstr ""
 msgid "Path to the maildir/mbox on the mail system."
 msgstr "Path to the maildir/mbox on the mail system."
 
-#: ../lib/modules/pykotaUser.inc:152 ../lib/modules/pykotaUser.inc:326
-#: ../lib/modules/pykotaUser.inc:369
+#: ../lib/modules/pykotaUser.inc:155 ../lib/modules/pykotaUser.inc:329
+#: ../lib/modules/pykotaUser.inc:372
 msgid "Payment"
 msgstr "Payment"
 
-#: ../lib/modules/pykotaUser.inc:148
+#: ../lib/modules/pykotaUser.inc:151
 msgid "Payment and job history"
 msgstr "Payment and job history"
 
-#: ../lib/modules/pykotaUser.inc:149
+#: ../lib/modules/pykotaUser.inc:152
 msgid "Payment and job history for this user."
 msgstr "Payment and job history for this user."
 
-#: ../lib/modules/pykotaUser.inc:265 ../lib/modules/pykotaUser.inc:283
-#: ../lib/modules/pykotaUser.inc:384 ../lib/modules/pykotaUser.inc:591
-#: ../lib/modules/pykotaUser.inc:985
+#: ../lib/modules/pykotaUser.inc:268 ../lib/modules/pykotaUser.inc:286
+#: ../lib/modules/pykotaUser.inc:387 ../lib/modules/pykotaUser.inc:594
+#: ../lib/modules/pykotaUser.inc:986
 msgid "Payment history"
 msgstr "Payment history"
 
-#: ../lib/tools/multiEdit.inc:53
+#: ../lib/tools/multiEdit.inc:54
 msgid "Performs modifications on multiple LDAP entries."
 msgstr "Performs modifications on multiple LDAP entries."
 
@@ -9809,33 +9860,33 @@ msgstr "Permanently delete all children also?"
 #: ../lib/modules/asteriskAccount.inc:281
 #: ../lib/modules/asteriskAccount.inc:422
 #: ../lib/modules/asteriskAccount.inc:678
-#: ../lib/modules/asteriskAccount.inc:1000
-#: ../lib/modules/asteriskAccount.inc:1266
+#: ../lib/modules/asteriskAccount.inc:998
+#: ../lib/modules/asteriskAccount.inc:1264
 msgid "Permit"
 msgstr "Permit"
 
-#: ../lib/modules/inetOrgPerson.inc:132
+#: ../lib/modules/inetOrgPerson.inc:130
 msgid "Personal"
 msgstr "Personal"
 
-#: ../lib/selfService.inc:402
+#: ../lib/selfService.inc:412
 msgid "Personal data"
 msgstr "Personal data"
 
 #: ../lib/types/user.inc:101 ../lib/types/user.inc:689
-#: ../lib/modules/windowsUser.inc:3220 ../lib/modules/windowsUser.inc:3233
-#: ../lib/modules/inetOrgPerson.inc:162 ../lib/modules/inetOrgPerson.inc:2440
-#: ../lib/modules/inetOrgPerson.inc:2734 ../lib/modules/inetOrgPerson.inc:2740
-#: ../lib/modules/inetOrgPerson.inc:3698 ../lib/modules/inetOrgPerson.inc:3729
-#: ../lib/modules/inetOrgPerson.inc:3748
+#: ../lib/modules/windowsUser.inc:3218 ../lib/modules/windowsUser.inc:3231
+#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:2436
+#: ../lib/modules/inetOrgPerson.inc:2730 ../lib/modules/inetOrgPerson.inc:2736
+#: ../lib/modules/inetOrgPerson.inc:3678 ../lib/modules/inetOrgPerson.inc:3709
+#: ../lib/modules/inetOrgPerson.inc:3728
 msgid "Photo"
 msgstr "Photo"
 
-#: ../lib/modules/windowsUser.inc:1761 ../lib/modules/inetOrgPerson.inc:1755
+#: ../lib/modules/windowsUser.inc:1761 ../lib/modules/inetOrgPerson.inc:1753
 msgid "Photo file"
 msgstr "Photo file"
 
-#: ../lib/modules/windowsUser.inc:1759 ../lib/modules/inetOrgPerson.inc:1753
+#: ../lib/modules/windowsUser.inc:1759 ../lib/modules/inetOrgPerson.inc:1751
 msgid "Photo file (JPG format)"
 msgstr "Photo file (JPG format)"
 
@@ -9843,12 +9894,12 @@ msgstr "Photo file (JPG format)"
 #: ../lib/modules/asteriskAccount.inc:282
 #: ../lib/modules/asteriskAccount.inc:429
 #: ../lib/modules/asteriskAccount.inc:682
-#: ../lib/modules/asteriskAccount.inc:1001
-#: ../lib/modules/asteriskAccount.inc:1268
+#: ../lib/modules/asteriskAccount.inc:999
+#: ../lib/modules/asteriskAccount.inc:1266
 msgid "Pickup group"
 msgstr "Pickup group"
 
-#: ../lib/modules/ldapPublicKey.inc:88
+#: ../lib/modules/ldapPublicKey.inc:91
 msgid "Please a comma separated list of your public SSH keys."
 msgstr "Please a comma separated list of your public SSH keys."
 
@@ -9864,7 +9915,7 @@ msgstr ""
 "Please activate this option if your scripts may generate HTML output. "
 "Otherwise, the output is treated as plain text."
 
-#: ../lib/modules/asteriskExtension.inc:193
+#: ../lib/modules/asteriskExtension.inc:195
 msgid "Please add at least one extension owner."
 msgstr "Please add at least one extension owner."
 
@@ -9896,7 +9947,7 @@ msgstr ""
 "Please choose the attribute to get the IMAP user name. The default is \"mail"
 "\" but you can also use \"uid\" or \"userPrincipalName\"."
 
-#: ../lib/modules/passwordSelfReset.inc:685
+#: ../lib/modules/passwordSelfReset.inc:683
 msgid "Please click here to continue: @@resetLink@@"
 msgstr "Please click here to continue: @@resetLink@@"
 
@@ -9908,7 +9959,7 @@ msgstr "Please click to lock/unlock this account."
 msgid "Please create a profile by clicking on the link below."
 msgstr "Please create a profile by clicking on the link below."
 
-#: ../lib/lists.inc:1098
+#: ../lib/lists.inc:1084
 msgid ""
 "Please do not edit multiple accounts in parallel in multiple browser tabs."
 msgstr ""
@@ -9918,6 +9969,10 @@ msgstr ""
 msgid "Please enter \"Yes\" or \"No\"."
 msgstr "Please enter \"Yes\" or \"No\"."
 
+#: ../templates/selfService/adminMain.php:246
+msgid "Please enter a 2-factor base URL."
+msgstr "Please enter a 2-factor base URL."
+
 #: ../lib/modules/sambaSamAccount.inc:108
 msgid "Please enter a RID number or the name of a special account!"
 msgstr "Please enter a RID number or the name of a special account!"
@@ -9939,7 +9994,7 @@ msgstr ""
 msgid "Please enter a comma separated list of host names!"
 msgstr "Please enter a comma separated list of host names!"
 
-#: ../lib/modules/asteriskExtension.inc:185
+#: ../lib/modules/asteriskExtension.inc:187
 msgid "Please enter a common name."
 msgstr "Please enter a common name."
 
@@ -9962,7 +10017,7 @@ msgstr "Please enter a descriptive label for this field."
 msgid "Please enter a descriptive name for this entry."
 msgstr "Please enter a descriptive name for this entry."
 
-#: ../lib/modules/windowsGroup.inc:121
+#: ../lib/modules/windowsGroup.inc:124
 msgid "Please enter a descriptive text for this group."
 msgstr "Please enter a descriptive text for this group."
 
@@ -9974,8 +10029,8 @@ msgstr "Please enter a descriptive text for this host."
 msgid "Please enter a descriptive text for this user."
 msgstr "Please enter a descriptive text for this user."
 
-#: ../lib/modules/organizationalRole.inc:173
-#: ../lib/modules/groupOfNames.inc:211
+#: ../lib/modules/organizationalRole.inc:176
+#: ../lib/modules/groupOfNames.inc:214
 msgid "Please enter a group name!"
 msgstr "Please enter a group name!"
 
@@ -9995,7 +10050,7 @@ msgstr "Please enter a list of object classes for the new accounts."
 msgid "Please enter a mailbox."
 msgstr "Please enter a mailbox."
 
-#: ../lib/modules/device.inc:62
+#: ../lib/modules/device.inc:65
 msgid "Please enter a name for this device."
 msgstr "Please enter a name for this device."
 
@@ -10015,11 +10070,11 @@ msgstr "Please enter a name for your view."
 msgid "Please enter a name."
 msgstr "Please enter a name."
 
-#: ../lib/modules/customFields.inc:2764
+#: ../lib/modules/customFields.inc:2762
 msgid "Please enter a natural number for column count."
 msgstr "Please enter a natural number for column count."
 
-#: ../lib/modules/customFields.inc:2774
+#: ../lib/modules/customFields.inc:2772
 msgid "Please enter a natural number for row count."
 msgstr "Please enter a natural number for row count."
 
@@ -10046,14 +10101,14 @@ msgstr "Please enter a number for quota size."
 #: ../templates/lib/141_jquery-validationEngine-lang.php:54
 #: ../templates/lib/141_jquery-validationEngine-lang.php:58
 #: ../lib/passwordExpirationJob.inc:141 ../lib/passwordExpirationJob.inc:511
-#: ../lib/modules/mitKerberos.inc:298 ../lib/modules/zarafaUser.inc:430
-#: ../lib/modules/zarafaUser.inc:431 ../lib/modules/zarafaUser.inc:432
-#: ../lib/modules/zarafaUser.inc:433 ../lib/modules/zarafaUser.inc:434
-#: ../lib/modules/zarafaUser.inc:435 ../lib/modules/zarafaUser.inc:437
-#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/bindDLZ.inc:476
-#: ../lib/modules/windowsUser.inc:993 ../lib/modules/kolabUser.inc:257
-#: ../lib/modules/kolabUser.inc:258 ../lib/modules/inetOrgPerson.inc:2468
-#: ../lib/modules/inetOrgPerson.inc:2471 ../lib/modules/inetOrgPerson.inc:2474
+#: ../lib/modules/mitKerberos.inc:298 ../lib/modules/zarafaUser.inc:433
+#: ../lib/modules/zarafaUser.inc:434 ../lib/modules/zarafaUser.inc:435
+#: ../lib/modules/zarafaUser.inc:436 ../lib/modules/zarafaUser.inc:437
+#: ../lib/modules/zarafaUser.inc:438 ../lib/modules/zarafaUser.inc:440
+#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/bindDLZ.inc:479
+#: ../lib/modules/windowsUser.inc:993 ../lib/modules/kolabUser.inc:260
+#: ../lib/modules/kolabUser.inc:261 ../lib/modules/inetOrgPerson.inc:2464
+#: ../lib/modules/inetOrgPerson.inc:2467 ../lib/modules/inetOrgPerson.inc:2470
 #: ../lib/modules/sudoRole.inc:285 ../lib/modules/sudoRole.inc:286
 msgid "Please enter a number."
 msgstr "Please enter a number."
@@ -10090,7 +10145,7 @@ msgstr "Please enter a numeric value for the minimum password length."
 msgid "Please enter a numeric value for the password history length."
 msgstr "Please enter a numeric value for the password history length."
 
-#: ../lib/modules/range.inc:138
+#: ../lib/modules/range.inc:141
 msgid "Please enter a pool name."
 msgstr "Please enter a pool name."
 
@@ -10098,7 +10153,7 @@ msgstr "Please enter a pool name."
 msgid "Please enter a role name."
 msgstr "Please enter a role name."
 
-#: ../lib/modules/passwordSelfReset.inc:1446
+#: ../lib/modules/passwordSelfReset.inc:1444
 msgid "Please enter a security answer."
 msgstr "Please enter a security answer."
 
@@ -10126,7 +10181,7 @@ msgstr "Please enter a unique name for this field."
 msgid "Please enter a unique name for this password policy."
 msgstr "Please enter a unique name for this password policy."
 
-#: ../lib/modules/kolabUser.inc:274 ../lib/modules/kolabUser.inc:280
+#: ../lib/modules/kolabUser.inc:277 ../lib/modules/kolabUser.inc:283
 msgid "Please enter a user password."
 msgstr "Please enter a user password."
 
@@ -10135,11 +10190,11 @@ msgstr "Please enter a user password."
 msgid "Please enter a valid DN in the field:"
 msgstr "Please enter a valid DN in the field:"
 
-#: ../lib/types/bind.inc:206
+#: ../lib/types/bind.inc:183
 msgid "Please enter a valid DNS name."
 msgstr "Please enter a valid DNS name."
 
-#: ../lib/modules/customFields.inc:1194 ../lib/modules/customFields.inc:1770
+#: ../lib/modules/customFields.inc:1192 ../lib/modules/customFields.inc:1768
 msgid ""
 "Please enter a valid LDAP attribute name. Allowed characters are a-z, 0-9, _ "
 "and -."
@@ -10147,11 +10202,11 @@ msgstr ""
 "Please enter a valid LDAP attribute name. Allowed characters are a-z, 0-9, _ "
 "and -."
 
-#: ../templates/selfService/adminMain.php:225
+#: ../templates/selfService/adminMain.php:236
 msgid "Please enter a valid LDAP suffix."
 msgstr "Please enter a valid LDAP suffix."
 
-#: ../templates/selfService/adminMain.php:229
+#: ../templates/selfService/adminMain.php:240
 msgid ""
 "Please enter a valid LDAP user if you want to use it for all operations."
 msgstr ""
@@ -10161,22 +10216,22 @@ msgstr ""
 msgid "Please enter a valid account status."
 msgstr "Please enter a valid account status."
 
-#: ../lib/modules/bindDLZ.inc:529 ../lib/modules/bindDLZ.inc:530
+#: ../lib/modules/bindDLZ.inc:532 ../lib/modules/bindDLZ.inc:533
 msgid "Please enter a valid admin email address."
 msgstr "Please enter a valid admin email address."
 
-#: ../templates/config/confmain.php:657
+#: ../templates/config/confmain.php:694
 msgid "Please enter a valid bind user."
 msgstr "Please enter a valid bind user."
 
 #: ../lib/modules/windowsUser.inc:999 ../lib/modules/windowsUser.inc:1000
-#: ../lib/modules/inetOrgPerson.inc:105 ../lib/modules/inetOrgPerson.inc:106
+#: ../lib/modules/inetOrgPerson.inc:103 ../lib/modules/inetOrgPerson.inc:104
 msgid "Please enter a valid business category!"
 msgstr "Please enter a valid business category!"
 
 #: ../lib/modules/posixAccount.inc:129 ../lib/modules/posixAccount.inc:130
 #: ../lib/modules/windowsUser.inc:952 ../lib/modules/windowsUser.inc:953
-#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:94
 msgid "Please enter a valid common name!"
 msgstr "Please enter a valid common name!"
 
@@ -10238,8 +10293,8 @@ msgstr "Please enter a valid drive letter."
 #: ../lib/modules/qmailUser.inc:453 ../lib/modules/qmailUser.inc:487
 #: ../lib/modules/zarafaGroup.inc:198 ../lib/modules/zarafaGroup.inc:199
 #: ../lib/modules/windowsUser.inc:978 ../lib/modules/windowsUser.inc:979
-#: ../lib/modules/pykotaUser.inc:319 ../lib/modules/pykotaUser.inc:320
-#: ../lib/modules/inetOrgPerson.inc:80 ../lib/modules/inetOrgPerson.inc:82
+#: ../lib/modules/pykotaUser.inc:322 ../lib/modules/pykotaUser.inc:323
+#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:80
 #: ../lib/modules/kolabSharedFolder.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:260 ../lib/modules/qmailGroup.inc:420
 #: ../lib/modules/qmailGroup.inc:421 ../lib/modules/qmailGroup.inc:422
@@ -10249,10 +10304,10 @@ msgstr "Please enter a valid drive letter."
 #: ../lib/modules/qmailGroup.inc:430 ../lib/modules/qmailGroup.inc:431
 #: ../lib/modules/qmailGroup.inc:432 ../lib/modules/passwordSelfReset.inc:279
 #: ../lib/modules/passwordSelfReset.inc:280
-#: ../lib/modules/passwordSelfReset.inc:1104
-#: ../lib/modules/passwordSelfReset.inc:1345
-#: ../lib/modules/windowsGroup.inc:292 ../lib/modules/windowsGroup.inc:293
-#: ../lib/modules.inc:1202
+#: ../lib/modules/passwordSelfReset.inc:1102
+#: ../lib/modules/passwordSelfReset.inc:1343
+#: ../lib/modules/windowsGroup.inc:295 ../lib/modules/windowsGroup.inc:296
+#: ../lib/modules.inc:1210
 msgid "Please enter a valid email address!"
 msgstr "Please enter a valid email address!"
 
@@ -10262,18 +10317,18 @@ msgstr "Please enter a valid email address!"
 msgid "Please enter a valid email alias."
 msgstr "Please enter a valid email alias."
 
-#: ../lib/modules/passwordSelfReset.inc:1111
-#: ../lib/modules/passwordSelfReset.inc:1352
+#: ../lib/modules/passwordSelfReset.inc:1109
+#: ../lib/modules/passwordSelfReset.inc:1350
 msgid "Please enter a valid employee number."
 msgstr "Please enter a valid employee number."
 
 #: ../lib/modules/windowsUser.inc:997 ../lib/modules/windowsUser.inc:998
-#: ../lib/modules/inetOrgPerson.inc:93 ../lib/modules/inetOrgPerson.inc:94
+#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:92
 msgid "Please enter a valid employee type!"
 msgstr "Please enter a valid employee type!"
 
 #: ../lib/modules/windowsUser.inc:964 ../lib/modules/windowsUser.inc:965
-#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:77
+#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
 msgid "Please enter a valid fax number!"
 msgstr "Please enter a valid fax number!"
 
@@ -10285,7 +10340,7 @@ msgstr ""
 "Please enter a valid field name. Only letters, numbers, dash and underline "
 "are allowed."
 
-#: ../lib/lists.inc:229
+#: ../lib/lists.inc:231
 msgid ""
 "Please enter a valid filter. Only letters, numbers and \" _*$.@-\" are "
 "allowed."
@@ -10312,20 +10367,20 @@ msgstr "Please enter a valid from user."
 msgid "Please enter a valid group name!"
 msgstr "Please enter a valid group name!"
 
-#: ../lib/modules/windowsGroup.inc:294
+#: ../lib/modules/windowsGroup.inc:297
 msgid "Please enter a valid group scope."
 msgstr "Please enter a valid group scope."
 
-#: ../lib/modules/windowsGroup.inc:295
+#: ../lib/modules/windowsGroup.inc:298
 msgid "Please enter a valid group type."
 msgstr "Please enter a valid group type."
 
-#: ../lib/modules/pykotaUser.inc:327
+#: ../lib/modules/pykotaUser.inc:330
 msgid "Please enter a valid job suffix."
 msgstr "Please enter a valid job suffix."
 
 #: ../lib/modules/windowsUser.inc:995 ../lib/modules/windowsUser.inc:996
-#: ../lib/modules/inetOrgPerson.inc:91 ../lib/modules/inetOrgPerson.inc:92
+#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:90
 msgid "Please enter a valid job title!"
 msgstr "Please enter a valid job title!"
 
@@ -10334,7 +10389,7 @@ msgstr "Please enter a valid job title!"
 msgid "Please enter a valid last name."
 msgstr "Please enter a valid last name."
 
-#: ../lib/modules/pykotaGroup.inc:205 ../lib/modules/pykotaUser.inc:321
+#: ../lib/modules/pykotaGroup.inc:205 ../lib/modules/pykotaUser.inc:324
 msgid "Please enter a valid limit type."
 msgstr "Please enter a valid limit type."
 
@@ -10354,15 +10409,15 @@ msgstr "Please enter a valid list of host names."
 msgid "Please enter a valid list of service names."
 msgstr "Please enter a valid list of service names."
 
-#: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
+#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
 msgid "Please enter a valid mobile number!"
 msgstr "Please enter a valid mobile number!"
 
 #: ../lib/modules/pykotaPrinter.inc:215 ../lib/modules/pykotaPrinter.inc:216
 #: ../lib/modules/pykotaPrinter.inc:217 ../lib/modules/pykotaPrinter.inc:218
-#: ../lib/modules/pykotaUser.inc:322 ../lib/modules/pykotaUser.inc:323
-#: ../lib/modules/pykotaUser.inc:324 ../lib/modules/pykotaUser.inc:325
-#: ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:325 ../lib/modules/pykotaUser.inc:326
+#: ../lib/modules/pykotaUser.inc:327 ../lib/modules/pykotaUser.inc:328
+#: ../lib/modules/pykotaUser.inc:329
 msgid "Please enter a valid number (e.g. \"1.5\")."
 msgstr "Please enter a valid number (e.g. \"1.5\")."
 
@@ -10389,12 +10444,12 @@ msgstr "Please enter a valid path."
 msgid "Please enter a valid port number."
 msgstr "Please enter a valid port number."
 
-#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:86
+#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:84
 msgid "Please enter a valid postal address!"
 msgstr "Please enter a valid postal address!"
 
 #: ../lib/modules/windowsUser.inc:976 ../lib/modules/windowsUser.inc:977
-#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:90
+#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:88
 msgid "Please enter a valid postal code!"
 msgstr "Please enter a valid postal code!"
 
@@ -10407,13 +10462,13 @@ msgid "Please enter a valid realm."
 msgstr "Please enter a valid realm."
 
 #: ../lib/modules/kolabGroup.inc:181 ../lib/modules/kolabGroup.inc:182
-#: ../lib/modules/kolabUser.inc:253 ../lib/modules/kolabUser.inc:254
+#: ../lib/modules/kolabUser.inc:256 ../lib/modules/kolabUser.inc:257
 #: ../lib/modules/kolabSharedFolder.inc:250
 #: ../lib/modules/kolabSharedFolder.inc:251
 msgid "Please enter a valid recipient expression."
 msgstr "Please enter a valid recipient expression."
 
-#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:88
+#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:86
 msgid "Please enter a valid registered address."
 msgstr "Please enter a valid registered address."
 
@@ -10422,7 +10477,7 @@ msgid "Please enter a valid scoped affiliation."
 msgstr "Please enter a valid scoped affiliation."
 
 #: ../lib/modules/kolabGroup.inc:183 ../lib/modules/kolabGroup.inc:184
-#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabUser.inc:256
+#: ../lib/modules/kolabUser.inc:258 ../lib/modules/kolabUser.inc:259
 #: ../lib/modules/kolabSharedFolder.inc:252
 #: ../lib/modules/kolabSharedFolder.inc:253
 msgid "Please enter a valid sender expression."
@@ -10433,7 +10488,7 @@ msgstr "Please enter a valid sender expression."
 msgid "Please enter a valid server name where the mailboxes reside."
 msgstr "Please enter a valid server name where the mailboxes reside."
 
-#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:84
+#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:82
 msgid "Please enter a valid street name!"
 msgstr "Please enter a valid street name!"
 
@@ -10443,36 +10498,36 @@ msgstr "Please enter a valid street name!"
 #: ../lib/modules/windowsUser.inc:970 ../lib/modules/windowsUser.inc:971
 #: ../lib/modules/windowsUser.inc:972 ../lib/modules/windowsUser.inc:973
 #: ../lib/modules/windowsUser.inc:974 ../lib/modules/windowsUser.inc:975
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:69
 #: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:71
-#: ../lib/modules/inetOrgPerson.inc:72 ../lib/modules/inetOrgPerson.inc:73
-#: ../lib/modules/inetOrgPerson.inc:78 ../lib/modules/inetOrgPerson.inc:79
+#: ../lib/modules/inetOrgPerson.inc:76 ../lib/modules/inetOrgPerson.inc:77
 msgid "Please enter a valid telephone number!"
 msgstr "Please enter a valid telephone number!"
 
-#: ../lib/modules/passwordSelfReset.inc:1125
-#: ../lib/modules/passwordSelfReset.inc:1366
+#: ../lib/modules/passwordSelfReset.inc:1123
+#: ../lib/modules/passwordSelfReset.inc:1364
 msgid "Please enter a valid user name or email address."
 msgstr "Please enter a valid user name or email address."
 
-#: ../lib/modules/posixGroup.inc:786 ../lib/modules/posixAccount.inc:1130
+#: ../lib/modules/posixGroup.inc:784 ../lib/modules/posixAccount.inc:1130
 #: ../lib/modules/posixAccount.inc:1135
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "Please enter a value between %s and %s!"
 
-#: ../lib/modules/customFields.inc:2940
+#: ../lib/modules/customFields.inc:2938
 msgid "Please enter a value for status \"checked\"."
 msgstr "Please enter a value for status \"checked\"."
 
-#: ../lib/modules/customFields.inc:2947
+#: ../lib/modules/customFields.inc:2945
 msgid "Please enter a value for status \"unchecked\"."
 msgstr "Please enter a value for status \"unchecked\"."
 
-#: ../templates/multiEdit.php:144
+#: ../templates/multiEdit.php:167
 msgid "Please enter a value to add."
 msgstr "Please enter a value to add."
 
-#: ../templates/multiEdit.php:147
+#: ../templates/multiEdit.php:170
 msgid "Please enter a value to modify."
 msgstr "Please enter a value to modify."
 
@@ -10484,17 +10539,17 @@ msgstr "Please enter an alias for this group."
 msgid "Please enter an alias name."
 msgstr "Please enter an alias name."
 
-#: ../lib/modules/kolabUser.inc:286 ../lib/modules/imapAccess.inc:204
+#: ../lib/modules/kolabUser.inc:289 ../lib/modules/imapAccess.inc:204
 #, php-format
 msgid "Please enter an email address on this page: %s"
 msgstr "Please enter an email address on this page: %s"
 
-#: ../lib/modules/pykotaUser.inc:353
+#: ../lib/modules/pykotaUser.inc:356
 #, php-format
 msgid "Please enter an user name on this page: %s"
 msgstr "Please enter an user name on this page: %s"
 
-#: ../lib/modules/range.inc:139
+#: ../lib/modules/range.inc:142
 #, php-format
 msgid "Please enter at least one range for pool \"%s\"."
 msgstr "Please enter at least one range for pool \"%s\"."
@@ -10524,7 +10579,7 @@ msgstr "Please enter only ASCII characters for the run groups."
 msgid "Please enter only ASCII characters for the run users."
 msgstr "Please enter only ASCII characters for the run users."
 
-#: ../lib/modules/device.inc:140 ../lib/modules/device.inc:141
+#: ../lib/modules/device.inc:143 ../lib/modules/device.inc:144
 msgid "Please enter only ASCII characters for the serial number."
 msgstr "Please enter only ASCII characters for the serial number."
 
@@ -10566,7 +10621,7 @@ msgid ""
 msgstr ""
 "Please enter the DN of the LDAP entry with object class \"sambaUnixIdPool\"."
 
-#: ../lib/modules/bindDLZ.inc:93 ../lib/modules/bindDLZ.inc:97
+#: ../lib/modules/bindDLZ.inc:96 ../lib/modules/bindDLZ.inc:100
 msgid "Please enter the IP address for this entry."
 msgstr "Please enter the IP address for this entry."
 
@@ -10596,7 +10651,7 @@ msgstr ""
 "LDAP filter needs to match the given user name to exactly one DN. The value "
 "\"%USER%\" will be replaced by the user name from the login page."
 
-#: ../lib/modules/pykotaUser.inc:157
+#: ../lib/modules/pykotaUser.inc:160
 msgid ""
 "Please enter the LDAP suffix where the PyKota job entries are stored "
 "(configuration option \"jobbase\")."
@@ -10610,12 +10665,12 @@ msgid ""
 msgstr ""
 "Please enter the LDAP suffix where your Samba domain entries are stored."
 
-#: ../lib/modules/asteriskExtension.inc:188
+#: ../lib/modules/asteriskExtension.inc:190
 #: ../lib/modules/asteriskVoicemail.inc:214
 msgid "Please enter the account context."
 msgstr "Please enter the account context."
 
-#: ../lib/modules.inc:946
+#: ../lib/modules.inc:954
 msgid "Please enter the account information on the other pages first."
 msgstr "Please enter the account information on the other pages first."
 
@@ -10627,11 +10682,11 @@ msgstr "Please enter the account type."
 msgid "Please enter the account's type (e.g. \"friend\")."
 msgstr "Please enter the account's type (e.g. \"friend\")."
 
-#: ../lib/modules/asteriskExtension.inc:187
+#: ../lib/modules/asteriskExtension.inc:189
 msgid "Please enter the application data."
 msgstr "Please enter the application data."
 
-#: ../lib/modules/asteriskExtension.inc:186
+#: ../lib/modules/asteriskExtension.inc:188
 msgid "Please enter the application."
 msgstr "Please enter the application."
 
@@ -10669,7 +10724,7 @@ msgstr ""
 "\"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=server)(PORT=1521))"
 "(CONNECT_DATA=(SERVICE_NAME=db.example.com)))\")."
 
-#: ../lib/modules/puppetClient.inc:86 ../lib/modules/puppetClient.inc:90
+#: ../lib/modules/puppetClient.inc:89 ../lib/modules/puppetClient.inc:93
 msgid "Please enter the environment name for this node (e.g. production)."
 msgstr "Please enter the environment name for this node (e.g. production)."
 
@@ -10677,11 +10732,11 @@ msgstr "Please enter the environment name for this node (e.g. production)."
 msgid "Please enter the extension context."
 msgstr "Please enter the extension context."
 
-#: ../lib/modules/asteriskExtension.inc:189
+#: ../lib/modules/asteriskExtension.inc:191
 msgid "Please enter the extension name."
 msgstr "Please enter the extension name."
 
-#: ../lib/modules/windowsGroup.inc:117
+#: ../lib/modules/windowsGroup.inc:120
 msgid "Please enter the group name."
 msgstr "Please enter the group name."
 
@@ -10729,7 +10784,7 @@ msgstr ""
 "password. It is stored in your config.cfg file. If this is the first time "
 "you log in, enter \"lam\"."
 
-#: ../templates/config/mainlogin.php:151
+#: ../templates/config/mainlogin.php:157
 msgid "Please enter the master password to change the general preferences:"
 msgstr "Please enter the master password to change the general preferences:"
 
@@ -10753,7 +10808,7 @@ msgstr ""
 "Please enter the new name of the profile. The name may contain letters, "
 "numbers and -/_."
 
-#: ../help/help.inc:335
+#: ../help/help.inc:347
 msgid ""
 "Please enter the number of days before password expiration to send out the "
 "email."
@@ -10771,7 +10826,7 @@ msgstr ""
 "as clear-text in the self service profile."
 
 #: ../lib/modules/asteriskAccount.inc:116 ../lib/modules/posixAccount.inc:478
-#: ../lib/modules/windowsUser.inc:240 ../lib/modules/inetOrgPerson.inc:869
+#: ../lib/modules/windowsUser.inc:240 ../lib/modules/inetOrgPerson.inc:867
 msgid "Please enter the password which you want to set for this account."
 msgstr "Please enter the password which you want to set for this account."
 
@@ -10803,7 +10858,7 @@ msgid ""
 msgstr ""
 "Please enter the possible security questions for the password self reset."
 
-#: ../lib/modules/asteriskExtension.inc:191
+#: ../lib/modules/asteriskExtension.inc:193
 msgid "Please enter the priority."
 msgstr "Please enter the priority."
 
@@ -10811,7 +10866,7 @@ msgstr "Please enter the priority."
 msgid "Please enter the quota limit of this mailbox in kilobytes."
 msgstr "Please enter the quota limit of this mailbox in kilobytes."
 
-#: ../lib/modules/quota.inc:154
+#: ../lib/modules/quota.inc:157
 msgid ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
@@ -10819,7 +10874,7 @@ msgstr ""
 "Please enter the quota settings for this mount point. The syntax is: {soft "
 "block limit},{hard block limit},{soft inode limit},{hard inode limit}"
 
-#: ../lib/modules/systemQuotas.inc:69
+#: ../lib/modules/systemQuotas.inc:72
 msgid ""
 "Please enter the quota settings for this user. The syntax is: {mount point},"
 "{soft block limit},{hard block limit},{soft inode limit},{hard inode limit}."
@@ -10840,10 +10895,10 @@ msgstr ""
 "Please enter the regular expression (e.g. \"/^[0-9a-zA-Z]+$/\") to validate "
 "this field. For a syntax description see <a href=\"%s\">here</a>."
 
-#: ../templates/lists/changePassword.php:550
+#: ../templates/lists/changePassword.php:551
 #: ../lib/modules/selfRegistration.inc:582
 #: ../lib/modules/sambaSamAccount.inc:105 ../lib/modules/posixAccount.inc:109
-#: ../lib/modules/windowsUser.inc:986 ../lib/modules/customFields.inc:2661
+#: ../lib/modules/windowsUser.inc:986 ../lib/modules/customFields.inc:2659
 msgid "Please enter the same password in both password fields."
 msgstr "Please enter the same password in both password fields."
 
@@ -10867,7 +10922,7 @@ msgstr "Please enter the user name and password to connect to the database."
 msgid "Please enter the user's name."
 msgstr "Please enter the user's name."
 
-#: ../lib/modules/puppetClient.inc:106 ../lib/modules/puppetClient.inc:110
+#: ../lib/modules/puppetClient.inc:109 ../lib/modules/puppetClient.inc:113
 msgid ""
 "Please enter your Puppet variables for this node (e.g. config_exim=true)."
 msgstr ""
@@ -10889,11 +10944,11 @@ msgstr ""
 msgid "Please enter your password to change the server preferences:"
 msgstr "Please enter your password to change the server preferences:"
 
-#: ../lib/modules/ldapPublicKey.inc:84
+#: ../lib/modules/ldapPublicKey.inc:87
 msgid "Please enter your public SSH key."
 msgstr "Please enter your public SSH key."
 
-#: ../lib/modules/range.inc:489 ../lib/modules/fixed_ip.inc:404
+#: ../lib/modules/range.inc:492 ../lib/modules/fixed_ip.inc:407
 msgid "Please fill out the DHCP settings first."
 msgstr "Please fill out the DHCP settings first."
 
@@ -10909,7 +10964,7 @@ msgstr "Please install and activate a supported PDO extension."
 msgid "Please install and activate the PDO extension for PHP."
 msgstr "Please install and activate the PDO extension for PHP."
 
-#: ../templates/masscreate.php:246
+#: ../templates/upload/masscreate.php:272
 msgid ""
 "Please provide a CSV formated file with your account data. The cells in the "
 "first row must be filled with the column identifiers. The following rows "
@@ -10919,16 +10974,16 @@ msgstr ""
 "first row must be filled with the column identifiers. The following rows "
 "represent one account for each row."
 
-#: ../lib/config.inc:2365
+#: ../lib/config.inc:2508
 msgid "Please provide a file in DER or PEM format."
 msgstr "Please provide a file in DER or PEM format."
 
-#: ../templates/massBuildAccounts.php:255
+#: ../templates/upload/massBuildAccounts.php:265
 msgid "Please provide a file to upload."
 msgstr "Please provide a file to upload."
 
 #: ../lib/modules/windowsUser.inc:295 ../lib/modules/windowsUser.inc:391
-#: ../lib/modules/inetOrgPerson.inc:776
+#: ../lib/modules/inetOrgPerson.inc:774
 msgid ""
 "Please select an image file to upload. It must be in JPG format (.jpg/.jpeg)."
 msgstr ""
@@ -10938,7 +10993,7 @@ msgstr ""
 msgid "Please select the field type (e.g. text field)."
 msgstr "Please select the field type (e.g. text field)."
 
-#: ../help/help.inc:308
+#: ../help/help.inc:320
 msgid "Please select the suffix where changes should be done."
 msgstr "Please select the suffix where changes should be done."
 
@@ -10970,7 +11025,7 @@ msgstr ""
 msgid "Please set the voicemail password with \"Set password\" before saving."
 msgstr "Please set the voicemail password with \"Set password\" before saving."
 
-#: ../lib/modules.inc:895
+#: ../lib/modules.inc:903
 #, php-format
 msgid "Please set up all required attributes on page: %s"
 msgstr "Please set up all required attributes on page: %s"
@@ -10989,11 +11044,11 @@ msgstr ""
 "Please set your LDAP suffix to an LDAP entry with object class \"dhcpService"
 "\" or \"dhcpServer\"."
 
-#: ../templates/config/mainlogin.php:135 ../templates/config/mainlogin.php:138
+#: ../templates/config/mainlogin.php:140 ../templates/config/mainlogin.php:143
 msgid "Please setup your licence data."
 msgstr "Please setup your license data."
 
-#: ../templates/multiEdit.php:218
+#: ../templates/multiEdit.php:241
 msgid "Please specify at least one operation."
 msgstr "Please specify at least one operation."
 
@@ -11001,7 +11056,7 @@ msgstr "Please specify at least one operation."
 msgid "Please specify how your users need to identify themselves."
 msgstr "Please specify how your users need to identify themselves."
 
-#: ../lib/modules/windowsGroup.inc:149
+#: ../lib/modules/windowsGroup.inc:152
 msgid "Please specify the group scope."
 msgstr "Please specify the group scope."
 
@@ -11013,7 +11068,7 @@ msgstr ""
 "Please specify the possible values for this field. Each value can have a "
 "descriptive label that is displayed to the user."
 
-#: ../help/help.inc:312
+#: ../help/help.inc:324
 msgid ""
 "Please specify which attributes should be changed. The modify operation will "
 "also add an value if the attribute does not yet exist. To delete all values "
@@ -11023,7 +11078,7 @@ msgstr ""
 "also add an value if the attribute does not yet exist. To delete all values "
 "of an attribute please leave the value field empty."
 
-#: ../lib/modules/windowsUser.inc:1003 ../lib/modules/inetOrgPerson.inc:102
+#: ../lib/modules/windowsUser.inc:1003 ../lib/modules/inetOrgPerson.inc:100
 msgid "Please upload a .jpg/.jpeg file."
 msgstr "Please upload a .jpg/.jpeg file."
 
@@ -11036,11 +11091,11 @@ msgstr "Please wait"
 msgid "Policy count: %s"
 msgstr "Policy count: %s"
 
-#: ../lib/modules/kolabUser.inc:246
+#: ../lib/modules/kolabUser.inc:249
 msgid "Policy list has invalid format!"
 msgstr "Policy list has invalid format!"
 
-#: ../lib/modules/range.inc:550
+#: ../lib/modules/range.inc:553
 msgid "Pools"
 msgstr "Pools"
 
@@ -11048,11 +11103,11 @@ msgstr "Pools"
 #: ../lib/modules/asteriskAccount.inc:283
 #: ../lib/modules/asteriskAccount.inc:436
 #: ../lib/modules/asteriskAccount.inc:686
-#: ../lib/modules/asteriskAccount.inc:1002
-#: ../lib/modules/asteriskAccount.inc:1270 ../lib/modules/bindDLZ.inc:195
-#: ../lib/modules/bindDLZ.inc:199 ../lib/modules/bindDLZ.inc:399
-#: ../lib/modules/bindDLZ.inc:512 ../lib/modules/bindDLZ.inc:1365
-#: ../lib/modules/bindDLZ.inc:1604
+#: ../lib/modules/asteriskAccount.inc:1000
+#: ../lib/modules/asteriskAccount.inc:1268 ../lib/modules/bindDLZ.inc:198
+#: ../lib/modules/bindDLZ.inc:202 ../lib/modules/bindDLZ.inc:402
+#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:1368
+#: ../lib/modules/bindDLZ.inc:1605
 msgid "Port"
 msgstr "Port"
 
@@ -11060,22 +11115,22 @@ msgstr "Port"
 msgid "Port number."
 msgstr "Port number."
 
-#: ../templates/pdfedit/pdfpage.php:596 ../templates/pdfedit/pdfpage.php:606
-#: ../templates/pdfedit/pdfpage.php:616 ../templates/pdfedit/pdfpage.php:631
+#: ../templates/pdfedit/pdfpage.php:612 ../templates/pdfedit/pdfpage.php:622
+#: ../templates/pdfedit/pdfpage.php:632 ../templates/pdfedit/pdfpage.php:648
 msgid "Position"
 msgstr "Position"
 
-#: ../templates/masscreate.php:310 ../templates/masscreate.php:384
-#: ../lib/modules/customScripts.inc:125 ../lib/modules/customScripts.inc:127
-#: ../lib/modules/customScripts.inc:129
-#: ../lib/modules/sambaGroupMapping.inc:605
+#: ../templates/upload/masscreate.php:336
+#: ../templates/upload/masscreate.php:410 ../lib/modules/customScripts.inc:125
+#: ../lib/modules/customScripts.inc:127 ../lib/modules/customScripts.inc:129
+#: ../lib/modules/sambaGroupMapping.inc:603
 msgid "Possible values"
 msgstr "Possible values"
 
 #: ../lib/modules/pykotaPrinter.inc:130 ../lib/modules/posixGroup.inc:531
 #: ../lib/modules/sambaGroupMapping.inc:172
-#: ../lib/modules/organizationalRole.inc:103
-#: ../lib/modules/groupOfNames.inc:115
+#: ../lib/modules/organizationalRole.inc:106
+#: ../lib/modules/groupOfNames.inc:118
 msgid ""
 "Possible wildcards are: \"*\" = any character, \"^\" = line start, \"$\" = "
 "line end"
@@ -11085,49 +11140,49 @@ msgstr ""
 
 #: ../lib/modules/windowsUser.inc:174 ../lib/modules/windowsUser.inc:454
 #: ../lib/modules/windowsUser.inc:827 ../lib/modules/windowsUser.inc:922
-#: ../lib/modules/windowsUser.inc:1094 ../lib/modules/windowsUser.inc:2438
-#: ../lib/modules/windowsUser.inc:2621 ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:187 ../lib/modules/inetOrgPerson.inc:418
-#: ../lib/modules/inetOrgPerson.inc:565 ../lib/modules/inetOrgPerson.inc:692
-#: ../lib/modules/inetOrgPerson.inc:696 ../lib/modules/inetOrgPerson.inc:1315
-#: ../lib/modules/inetOrgPerson.inc:1318 ../lib/modules/inetOrgPerson.inc:1988
-#: ../lib/modules/inetOrgPerson.inc:2646 ../lib/modules/inetOrgPerson.inc:3646
-#: ../lib/modules/inetOrgPerson.inc:3716
+#: ../lib/modules/windowsUser.inc:1094 ../lib/modules/windowsUser.inc:2436
+#: ../lib/modules/windowsUser.inc:2619 ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:185 ../lib/modules/inetOrgPerson.inc:416
+#: ../lib/modules/inetOrgPerson.inc:563 ../lib/modules/inetOrgPerson.inc:690
+#: ../lib/modules/inetOrgPerson.inc:694 ../lib/modules/inetOrgPerson.inc:1313
+#: ../lib/modules/inetOrgPerson.inc:1316 ../lib/modules/inetOrgPerson.inc:1984
+#: ../lib/modules/inetOrgPerson.inc:2642 ../lib/modules/inetOrgPerson.inc:3626
+#: ../lib/modules/inetOrgPerson.inc:3696
 msgid "Post office box"
 msgstr "Post office box"
 
-#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:199 ../lib/modules/inetOrgPerson.inc:402
-#: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:708
-#: ../lib/modules/inetOrgPerson.inc:1359 ../lib/modules/inetOrgPerson.inc:1990
-#: ../lib/modules/inetOrgPerson.inc:2613 ../lib/modules/inetOrgPerson.inc:3654
-#: ../lib/modules/inetOrgPerson.inc:3718
+#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:197 ../lib/modules/inetOrgPerson.inc:400
+#: ../lib/modules/inetOrgPerson.inc:575 ../lib/modules/inetOrgPerson.inc:706
+#: ../lib/modules/inetOrgPerson.inc:1357 ../lib/modules/inetOrgPerson.inc:1986
+#: ../lib/modules/inetOrgPerson.inc:2609 ../lib/modules/inetOrgPerson.inc:3634
+#: ../lib/modules/inetOrgPerson.inc:3698
 msgid "Postal address"
 msgstr "Postal address"
 
-#: ../lib/modules/inetOrgPerson.inc:709
+#: ../lib/modules/inetOrgPerson.inc:707
 msgid "Postal address, city"
 msgstr "Postal address, city"
 
 #: ../lib/modules/windowsUser.inc:170 ../lib/modules/windowsUser.inc:460
 #: ../lib/modules/windowsUser.inc:826 ../lib/modules/windowsUser.inc:923
 #: ../lib/modules/windowsUser.inc:976 ../lib/modules/windowsUser.inc:1095
-#: ../lib/modules/windowsUser.inc:2437 ../lib/modules/windowsUser.inc:2622
-#: ../lib/modules/inetOrgPerson.inc:89 ../lib/modules/inetOrgPerson.inc:162
-#: ../lib/modules/inetOrgPerson.inc:190 ../lib/modules/inetOrgPerson.inc:394
-#: ../lib/modules/inetOrgPerson.inc:568 ../lib/modules/inetOrgPerson.inc:700
-#: ../lib/modules/inetOrgPerson.inc:704 ../lib/modules/inetOrgPerson.inc:1324
-#: ../lib/modules/inetOrgPerson.inc:1327 ../lib/modules/inetOrgPerson.inc:1989
-#: ../lib/modules/inetOrgPerson.inc:2635 ../lib/modules/inetOrgPerson.inc:3648
-#: ../lib/modules/inetOrgPerson.inc:3716
+#: ../lib/modules/windowsUser.inc:2435 ../lib/modules/windowsUser.inc:2620
+#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:160
+#: ../lib/modules/inetOrgPerson.inc:188 ../lib/modules/inetOrgPerson.inc:392
+#: ../lib/modules/inetOrgPerson.inc:566 ../lib/modules/inetOrgPerson.inc:698
+#: ../lib/modules/inetOrgPerson.inc:702 ../lib/modules/inetOrgPerson.inc:1322
+#: ../lib/modules/inetOrgPerson.inc:1325 ../lib/modules/inetOrgPerson.inc:1985
+#: ../lib/modules/inetOrgPerson.inc:2631 ../lib/modules/inetOrgPerson.inc:3628
+#: ../lib/modules/inetOrgPerson.inc:3696
 msgid "Postal code"
 msgstr "Postal code"
 
-#: ../lib/modules/puppetClient.inc:117
+#: ../lib/modules/puppetClient.inc:120
 msgid "Predefined classes"
 msgstr "Predefined classes"
 
-#: ../lib/modules/puppetClient.inc:121 ../lib/modules/puppetClient.inc:552
+#: ../lib/modules/puppetClient.inc:124 ../lib/modules/puppetClient.inc:553
 msgid "Predefined environments"
 msgstr "Predefined environments"
 
@@ -11140,9 +11195,9 @@ msgstr "Predefined services"
 msgid "Predefined values"
 msgstr "Predefined values"
 
-#: ../lib/modules/bindDLZ.inc:203 ../lib/modules/bindDLZ.inc:207
-#: ../lib/modules/bindDLZ.inc:287 ../lib/modules/bindDLZ.inc:502
-#: ../lib/modules/bindDLZ.inc:923 ../lib/modules/bindDLZ.inc:1518
+#: ../lib/modules/bindDLZ.inc:206 ../lib/modules/bindDLZ.inc:210
+#: ../lib/modules/bindDLZ.inc:290 ../lib/modules/bindDLZ.inc:505
+#: ../lib/modules/bindDLZ.inc:926 ../lib/modules/bindDLZ.inc:1519
 msgid "Preference"
 msgstr "Preference"
 
@@ -11150,31 +11205,31 @@ msgstr "Preference"
 msgid "Prefix for mailboxes"
 msgstr "Prefix for mailboxes"
 
-#: ../lib/modules/windowsUser.inc:672 ../lib/modules/inetOrgPerson.inc:348
+#: ../lib/modules/windowsUser.inc:672 ../lib/modules/inetOrgPerson.inc:346
 msgid "President"
 msgstr "President"
 
-#: ../lib/modules/pykotaUser.inc:650 ../lib/modules/pykotaUser.inc:995
+#: ../lib/modules/pykotaUser.inc:653 ../lib/modules/pykotaUser.inc:996
 msgid "Price"
 msgstr "Price"
 
 #: ../lib/types/pykotaPrinterType.inc:94 ../lib/modules/pykotaPrinter.inc:111
 #: ../lib/modules/pykotaPrinter.inc:174 ../lib/modules/pykotaPrinter.inc:197
 #: ../lib/modules/pykotaPrinter.inc:215 ../lib/modules/pykotaPrinter.inc:235
-#: ../lib/modules/pykotaPrinter.inc:590
+#: ../lib/modules/pykotaPrinter.inc:588
 msgid "Price per job"
 msgstr "Price per job"
 
 #: ../lib/types/pykotaPrinterType.inc:93 ../lib/modules/pykotaPrinter.inc:115
 #: ../lib/modules/pykotaPrinter.inc:180 ../lib/modules/pykotaPrinter.inc:198
 #: ../lib/modules/pykotaPrinter.inc:217 ../lib/modules/pykotaPrinter.inc:237
-#: ../lib/modules/pykotaPrinter.inc:591
+#: ../lib/modules/pykotaPrinter.inc:589
 msgid "Price per page"
 msgstr "Price per page"
 
 #: ../lib/modules/eduPerson.inc:88 ../lib/modules/eduPerson.inc:168
 #: ../lib/modules/eduPerson.inc:229 ../lib/modules/eduPerson.inc:283
-#: ../lib/modules/eduPerson.inc:558
+#: ../lib/modules/eduPerson.inc:556
 msgid "Primary affiliation"
 msgstr "Primary affiliation"
 
@@ -11182,29 +11237,29 @@ msgstr "Primary affiliation"
 #: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:407
 #: ../lib/modules/posixAccount.inc:469 ../lib/modules/posixAccount.inc:511
 #: ../lib/modules/posixAccount.inc:1431 ../lib/modules/posixAccount.inc:1727
-#: ../lib/modules/posixAccount.inc:1773 ../lib/modules/posixAccount.inc:1845
+#: ../lib/modules/posixAccount.inc:1773 ../lib/modules/posixAccount.inc:1843
 msgid "Primary group"
 msgstr "Primary group"
 
-#: ../lib/modules/bindDLZ.inc:236
+#: ../lib/modules/bindDLZ.inc:239
 msgid "Primary master DNS server for this zone (e.g. \"ns1.example.com.\")."
 msgstr "Primary master DNS server for this zone (e.g. \"ns1.example.com.\")."
 
-#: ../lib/modules/bindDLZ.inc:235 ../lib/modules/bindDLZ.inc:345
-#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:531
-#: ../lib/modules/bindDLZ.inc:1047 ../lib/modules/bindDLZ.inc:1554
+#: ../lib/modules/bindDLZ.inc:238 ../lib/modules/bindDLZ.inc:348
+#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:534
+#: ../lib/modules/bindDLZ.inc:1050 ../lib/modules/bindDLZ.inc:1555
 msgid "Primary name server"
 msgstr "Primary name server"
 
 #: ../lib/modules/eduPerson.inc:130 ../lib/modules/eduPerson.inc:206
 #: ../lib/modules/eduPerson.inc:232 ../lib/modules/eduPerson.inc:247
-#: ../lib/modules/eduPerson.inc:348 ../lib/modules/eduPerson.inc:565
+#: ../lib/modules/eduPerson.inc:348 ../lib/modules/eduPerson.inc:563
 msgid "Primary organisational unit"
 msgstr "Primary organizational unit"
 
 #: ../lib/modules/eduPerson.inc:114 ../lib/modules/eduPerson.inc:161
 #: ../lib/modules/eduPerson.inc:230 ../lib/modules/eduPerson.inc:277
-#: ../lib/modules/eduPerson.inc:560
+#: ../lib/modules/eduPerson.inc:558
 msgid "Principal name"
 msgstr "Principal name"
 
@@ -11212,7 +11267,7 @@ msgstr "Principal name"
 msgid "Principal name is invalid!"
 msgstr "Principal name is invalid!"
 
-#: ../lib/modules/pykotaUser.inc:648 ../lib/modules/pykotaUser.inc:994
+#: ../lib/modules/pykotaUser.inc:651 ../lib/modules/pykotaUser.inc:995
 msgid "Printer"
 msgstr "Printer"
 
@@ -11226,14 +11281,14 @@ msgid "Printer description."
 msgstr "Printer description."
 
 #: ../lib/modules/pykotaPrinter.inc:200 ../lib/modules/pykotaPrinter.inc:258
-#: ../lib/modules/pykotaPrinter.inc:624
+#: ../lib/modules/pykotaPrinter.inc:622
 msgid "Printer groups"
 msgstr "Printer groups"
 
 #: ../lib/types/pykotaPrinterType.inc:91 ../lib/modules/pykotaPrinter.inc:95
 #: ../lib/modules/pykotaPrinter.inc:146 ../lib/modules/pykotaPrinter.inc:193
 #: ../lib/modules/pykotaPrinter.inc:209 ../lib/modules/pykotaPrinter.inc:211
-#: ../lib/modules/pykotaPrinter.inc:231 ../lib/modules/pykotaPrinter.inc:587
+#: ../lib/modules/pykotaPrinter.inc:231 ../lib/modules/pykotaPrinter.inc:585
 #: ../lib/modules/pykotaBillingCode.inc:101
 msgid "Printer name"
 msgstr "Printer name"
@@ -11262,10 +11317,10 @@ msgstr ""
 msgid "Printers"
 msgstr "Printers"
 
-#: ../lib/modules/bindDLZ.inc:179 ../lib/modules/bindDLZ.inc:183
-#: ../lib/modules/bindDLZ.inc:389 ../lib/modules/bindDLZ.inc:508
-#: ../lib/modules/bindDLZ.inc:1355 ../lib/modules/bindDLZ.inc:1602
-#: ../lib/modules/asteriskExtension.inc:106
+#: ../lib/modules/bindDLZ.inc:182 ../lib/modules/bindDLZ.inc:186
+#: ../lib/modules/bindDLZ.inc:392 ../lib/modules/bindDLZ.inc:511
+#: ../lib/modules/bindDLZ.inc:1358 ../lib/modules/bindDLZ.inc:1603
+#: ../lib/modules/asteriskExtension.inc:108
 #: ../lib/modules/asteriskExtension.inc:825
 msgid "Priority"
 msgstr "Priority"
@@ -11279,7 +11334,7 @@ msgstr "Proceed"
 #: ../lib/modules/freeRadius.inc:124 ../lib/modules/freeRadius.inc:172
 #: ../lib/modules/freeRadius.inc:247 ../lib/modules/freeRadius.inc:276
 #: ../lib/modules/freeRadius.inc:318 ../lib/modules/freeRadius.inc:400
-#: ../lib/modules/freeRadius.inc:700
+#: ../lib/modules/freeRadius.inc:698
 msgid "Profile"
 msgstr "Profile"
 
@@ -11292,8 +11347,8 @@ msgstr "Profile DN"
 msgid "Profile deleted."
 msgstr "Profile deleted."
 
-#: ../templates/profedit/profilepage.php:187
-#: ../templates/profedit/profilemain.php:99 ../lib/tools/profileEditor.inc:44
+#: ../templates/profedit/profilepage.php:200
+#: ../templates/profedit/profilemain.php:117 ../lib/tools/profileEditor.inc:45
 msgid "Profile editor"
 msgstr "Profile editor"
 
@@ -11314,9 +11369,8 @@ msgstr "Profile management"
 #: ../templates/selfService/profManage.php:202
 #: ../templates/selfService/profManage.php:217
 #: ../templates/selfService/profManage.php:235
-#: ../templates/profedit/profilepage.php:191
-#: ../templates/profedit/profilemain.php:283
-#: ../templates/profedit/profilemain.php:328 ../help/help.inc:226
+#: ../templates/profedit/profilepage.php:204
+#: ../templates/profedit/profilemain.php:372 ../help/help.inc:226
 msgid "Profile name"
 msgstr "Profile name"
 
@@ -11324,12 +11378,12 @@ msgstr "Profile name"
 #: ../templates/config/profmanage.php:130
 #: ../templates/config/profmanage.php:141
 #: ../templates/selfService/profManage.php:61
-#: ../templates/selfService/profManage.php:76 ../lib/config.inc:178
+#: ../templates/selfService/profManage.php:76 ../lib/config.inc:181
 msgid "Profile name is invalid!"
 msgstr "Profile name is invalid!"
 
 #: ../templates/config/profmanage.php:233
-#: ../templates/config/profmanage.php:288
+#: ../templates/config/profmanage.php:288 ../templates/config/confmain.php:562
 msgid "Profile password"
 msgstr "Profile password"
 
@@ -11349,11 +11403,11 @@ msgstr "Profile passwords are different or empty!"
 #: ../lib/modules/sambaSamAccount.inc:1526
 #: ../lib/modules/sambaSamAccount.inc:1706
 #: ../lib/modules/sambaSamAccount.inc:1890
-#: ../lib/modules/sambaSamAccount.inc:1918
-#: ../lib/modules/sambaSamAccount.inc:1933 ../lib/modules/windowsUser.inc:222
+#: ../lib/modules/sambaSamAccount.inc:1916
+#: ../lib/modules/sambaSamAccount.inc:1931 ../lib/modules/windowsUser.inc:222
 #: ../lib/modules/windowsUser.inc:558 ../lib/modules/windowsUser.inc:746
 #: ../lib/modules/windowsUser.inc:837 ../lib/modules/windowsUser.inc:982
-#: ../lib/modules/windowsUser.inc:1218 ../lib/modules/windowsUser.inc:2484
+#: ../lib/modules/windowsUser.inc:1218 ../lib/modules/windowsUser.inc:2482
 msgid "Profile path"
 msgstr "Profile path"
 
@@ -11362,11 +11416,11 @@ msgstr "Profile path"
 msgid "Profile path is invalid!"
 msgstr "Profile path is invalid!"
 
-#: ../templates/profedit/profilemain.php:154
+#: ../templates/profedit/profilemain.php:197
 msgid "Profile was saved."
 msgstr "Profile was saved."
 
-#: ../templates/profedit/profilemain.php:249
+#: ../templates/profedit/profilemain.php:295
 msgid "Profiles"
 msgstr "Profiles"
 
@@ -11374,35 +11428,40 @@ msgstr "Profiles"
 msgid "Program to execute for all incoming mails."
 msgstr "Program to execute for all incoming mails."
 
-#: ../templates/multiEdit.php:236
+#: ../templates/multiEdit.php:259
 msgid "Progress"
 msgstr "Progress"
 
+#: ../templates/config/confmain.php:538
+#: ../templates/selfService/adminMain.php:510
+msgid "Provider"
+msgstr "Provider"
+
 #: ../lib/modules/zarafaServer.inc:84 ../lib/modules/zarafaServer.inc:128
 #: ../lib/modules/zarafaServer.inc:141 ../lib/modules/zarafaServer.inc:163
-#: ../lib/modules/zarafaServer.inc:212 ../lib/modules/zarafaServer.inc:360
+#: ../lib/modules/zarafaServer.inc:212 ../lib/modules/zarafaServer.inc:358
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
 #: ../lib/types/user.inc:107 ../lib/modules/windowsUser.inc:378
 #: ../lib/modules/windowsUser.inc:382 ../lib/modules/windowsUser.inc:589
 #: ../lib/modules/windowsUser.inc:847 ../lib/modules/windowsUser.inc:1104
-#: ../lib/modules/windowsUser.inc:2449 ../lib/modules/windowsUser.inc:3209
+#: ../lib/modules/windowsUser.inc:2447 ../lib/modules/windowsUser.inc:3207
 msgid "Proxy-Addresses"
 msgstr "Proxy-Addresses"
 
 #: ../lib/modules/zarafaServer.inc:80 ../lib/modules/zarafaServer.inc:118
 #: ../lib/modules/zarafaServer.inc:138 ../lib/modules/zarafaServer.inc:225
-#: ../lib/modules/zarafaServer.inc:365
+#: ../lib/modules/zarafaServer.inc:363
 msgid "Public store"
 msgstr "Public store"
 
-#: ../lib/modules/puppetClient.inc:75
+#: ../lib/modules/puppetClient.inc:78
 msgid "Puppet"
 msgstr "Puppet"
 
 #: ../lib/modules/pykotaPrinter.inc:79 ../lib/modules/pykotaGroup.inc:93
-#: ../lib/modules/pykotaUser.inc:93 ../lib/modules/pykotaBillingCode.inc:61
+#: ../lib/modules/pykotaUser.inc:96 ../lib/modules/pykotaBillingCode.inc:61
 msgid "PyKota"
 msgstr "PyKota"
 
@@ -11412,7 +11471,7 @@ msgstr "PyKota billing codes"
 
 #: ../lib/modules/pykotaGroup.inc:121 ../lib/modules/pykotaGroup.inc:148
 #: ../lib/modules/pykotaGroup.inc:181 ../lib/modules/pykotaGroup.inc:201
-#: ../lib/modules/pykotaGroup.inc:203 ../lib/modules/pykotaGroup.inc:470
+#: ../lib/modules/pykotaGroup.inc:203 ../lib/modules/pykotaGroup.inc:468
 msgid "PyKota group name"
 msgstr "PyKota group name"
 
@@ -11420,9 +11479,9 @@ msgstr "PyKota group name"
 msgid "PyKota printers"
 msgstr "PyKota printers"
 
-#: ../lib/modules/pykotaUser.inc:124 ../lib/modules/pykotaUser.inc:190
-#: ../lib/modules/pykotaUser.inc:260 ../lib/modules/pykotaUser.inc:315
-#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:894
+#: ../lib/modules/pykotaUser.inc:127 ../lib/modules/pykotaUser.inc:193
+#: ../lib/modules/pykotaUser.inc:263 ../lib/modules/pykotaUser.inc:318
+#: ../lib/modules/pykotaUser.inc:320 ../lib/modules/pykotaUser.inc:895
 msgid "PyKota user name"
 msgstr "PyKota user name"
 
@@ -11430,11 +11489,11 @@ msgstr "PyKota user name"
 msgid "Pykota group name"
 msgstr "Pykota group name"
 
-#: ../lib/modules/pykotaUser.inc:359
+#: ../lib/modules/pykotaUser.inc:362
 msgid "Pykota user name"
 msgstr "Pykota user name"
 
-#: ../lib/modules/qmailUser.inc:87 ../lib/modules/qmailUser.inc:1230
+#: ../lib/modules/qmailUser.inc:87 ../lib/modules/qmailUser.inc:1228
 #: ../lib/modules/qmailGroup.inc:56
 msgid "Qmail"
 msgstr "Qmail"
@@ -11443,8 +11502,8 @@ msgstr "Qmail"
 #: ../lib/modules/asteriskAccount.inc:284
 #: ../lib/modules/asteriskAccount.inc:443
 #: ../lib/modules/asteriskAccount.inc:691
-#: ../lib/modules/asteriskAccount.inc:1003
-#: ../lib/modules/asteriskAccount.inc:1272
+#: ../lib/modules/asteriskAccount.inc:1001
+#: ../lib/modules/asteriskAccount.inc:1270
 msgid "Qualify"
 msgstr "Qualify"
 
@@ -11464,41 +11523,41 @@ msgstr "Qualify"
 #: ../lib/modules/passwordSelfReset.inc:323
 #: ../lib/modules/passwordSelfReset.inc:327
 #: ../lib/modules/passwordSelfReset.inc:330
+#: ../lib/modules/passwordSelfReset.inc:499
+#: ../lib/modules/passwordSelfReset.inc:500
 #: ../lib/modules/passwordSelfReset.inc:501
-#: ../lib/modules/passwordSelfReset.inc:502
-#: ../lib/modules/passwordSelfReset.inc:503
+#: ../lib/modules/passwordSelfReset.inc:788
+#: ../lib/modules/passwordSelfReset.inc:789
 #: ../lib/modules/passwordSelfReset.inc:790
-#: ../lib/modules/passwordSelfReset.inc:791
-#: ../lib/modules/passwordSelfReset.inc:792
-#: ../lib/modules/passwordSelfReset.inc:1262
+#: ../lib/modules/passwordSelfReset.inc:1260
 msgid "Question"
 msgstr "Question"
 
-#: ../lib/modules/qmailUser.inc:678 ../lib/modules/quota.inc:87
-#: ../lib/modules/quota.inc:100 ../lib/modules/quota.inc:153
+#: ../lib/modules/qmailUser.inc:678 ../lib/modules/quota.inc:90
+#: ../lib/modules/quota.inc:103 ../lib/modules/quota.inc:156
 #: ../lib/modules/pykotaGroup.inc:61 ../lib/modules/pykotaGroup.inc:175
-#: ../lib/modules/pykotaGroup.inc:176 ../lib/modules/zarafaUser.inc:510
-#: ../lib/modules/pykotaUser.inc:61 ../lib/modules/pykotaUser.inc:235
-#: ../lib/modules/pykotaUser.inc:236 ../lib/modules/systemQuotas.inc:58
-#: ../lib/modules/systemQuotas.inc:68 ../lib/modules/systemQuotas.inc:75
-#: ../lib/modules/systemQuotas.inc:81 ../lib/modules/systemQuotas.inc:88
+#: ../lib/modules/pykotaGroup.inc:176 ../lib/modules/zarafaUser.inc:513
+#: ../lib/modules/pykotaUser.inc:64 ../lib/modules/pykotaUser.inc:238
+#: ../lib/modules/pykotaUser.inc:239 ../lib/modules/systemQuotas.inc:61
+#: ../lib/modules/systemQuotas.inc:71 ../lib/modules/systemQuotas.inc:78
+#: ../lib/modules/systemQuotas.inc:84 ../lib/modules/systemQuotas.inc:91
 #: ../lib/modules/imapAccess.inc:114 ../lib/modules/imapAccess.inc:138
 msgid "Quota"
 msgstr "Quota"
 
-#: ../lib/modules/quota.inc:704
+#: ../lib/modules/quota.inc:705
 #, php-format
 msgid "Quota for %s on %s"
 msgstr "Quota for %s on %s"
 
-#: ../lib/modules/zarafaUser.inc:114 ../lib/modules/zarafaUser.inc:248
-#: ../lib/modules/zarafaUser.inc:371 ../lib/modules/zarafaUser.inc:434
-#: ../lib/modules/zarafaUser.inc:545 ../lib/modules/zarafaUser.inc:1269
-#: ../lib/modules/zarafaUser.inc:1355 ../lib/modules/zarafaUser.inc:1830
+#: ../lib/modules/zarafaUser.inc:117 ../lib/modules/zarafaUser.inc:251
+#: ../lib/modules/zarafaUser.inc:374 ../lib/modules/zarafaUser.inc:437
+#: ../lib/modules/zarafaUser.inc:548 ../lib/modules/zarafaUser.inc:1270
+#: ../lib/modules/zarafaUser.inc:1356 ../lib/modules/zarafaUser.inc:1831
 msgid "Quota hard limit"
 msgstr "Quota hard limit"
 
-#: ../lib/modules/quota.inc:63
+#: ../lib/modules/quota.inc:66
 msgid "Quota has wrong format!"
 msgstr "Quota has wrong format!"
 
@@ -11506,37 +11565,38 @@ msgstr "Quota has wrong format!"
 msgid "Quota limit (kB)"
 msgstr "Quota limit (kB)"
 
-#: ../lib/modules/zarafaUser.inc:102 ../lib/modules/zarafaUser.inc:222
-#: ../lib/modules/zarafaUser.inc:362 ../lib/modules/zarafaUser.inc:517
-#: ../lib/modules/zarafaUser.inc:1280 ../lib/modules/zarafaUser.inc:1346
-#: ../lib/modules/zarafaUser.inc:1824
+#: ../lib/modules/zarafaUser.inc:105 ../lib/modules/zarafaUser.inc:225
+#: ../lib/modules/zarafaUser.inc:365 ../lib/modules/zarafaUser.inc:520
+#: ../lib/modules/zarafaUser.inc:1281 ../lib/modules/zarafaUser.inc:1347
+#: ../lib/modules/zarafaUser.inc:1825
 msgid "Quota override"
 msgstr "Quota override"
 
 #: ../lib/modules/qmailUser.inc:106 ../lib/modules/qmailUser.inc:133
 #: ../lib/modules/qmailUser.inc:219 ../lib/modules/qmailUser.inc:308
 #: ../lib/modules/qmailUser.inc:409 ../lib/modules/qmailUser.inc:685
-#: ../lib/modules/qmailUser.inc:1115
+#: ../lib/modules/qmailUser.inc:1113
 msgid "Quota size"
 msgstr "Quota size"
 
-#: ../lib/modules/zarafaUser.inc:110 ../lib/modules/zarafaUser.inc:240
-#: ../lib/modules/zarafaUser.inc:368 ../lib/modules/zarafaUser.inc:432
-#: ../lib/modules/zarafaUser.inc:535 ../lib/modules/zarafaUser.inc:1268
-#: ../lib/modules/zarafaUser.inc:1352 ../lib/modules/zarafaUser.inc:1828
+#: ../lib/modules/zarafaUser.inc:113 ../lib/modules/zarafaUser.inc:243
+#: ../lib/modules/zarafaUser.inc:371 ../lib/modules/zarafaUser.inc:435
+#: ../lib/modules/zarafaUser.inc:538 ../lib/modules/zarafaUser.inc:1269
+#: ../lib/modules/zarafaUser.inc:1353 ../lib/modules/zarafaUser.inc:1829
 msgid "Quota soft limit"
 msgstr "Quota soft limit"
 
-#: ../lib/modules/zarafaUser.inc:106 ../lib/modules/zarafaUser.inc:232
-#: ../lib/modules/zarafaUser.inc:365 ../lib/modules/zarafaUser.inc:430
-#: ../lib/modules/zarafaUser.inc:525 ../lib/modules/zarafaUser.inc:1267
-#: ../lib/modules/zarafaUser.inc:1349 ../lib/modules/zarafaUser.inc:1826
+#: ../lib/modules/zarafaUser.inc:109 ../lib/modules/zarafaUser.inc:235
+#: ../lib/modules/zarafaUser.inc:368 ../lib/modules/zarafaUser.inc:433
+#: ../lib/modules/zarafaUser.inc:528 ../lib/modules/zarafaUser.inc:1268
+#: ../lib/modules/zarafaUser.inc:1350 ../lib/modules/zarafaUser.inc:1827
 msgid "Quota warning limit"
 msgstr "Quota warning limit"
 
-#: ../templates/masscreate.php:334 ../templates/profedit/profilepage.php:218
+#: ../templates/upload/masscreate.php:360
+#: ../templates/profedit/profilepage.php:230
 #: ../lib/modules/selfRegistration.inc:98
-#: ../lib/modules/selfRegistration.inc:215 ../lib/modules.inc:1022
+#: ../lib/modules/selfRegistration.inc:215 ../lib/modules.inc:1030
 #: ../help/help.inc:224
 msgid "RDN identifier"
 msgstr "RDN identifier"
@@ -11547,7 +11607,7 @@ msgstr "RID (Windows UID)"
 
 #: ../lib/modules/sambaDomain.inc:97 ../lib/modules/sambaDomain.inc:158
 #: ../lib/modules/sambaDomain.inc:189 ../lib/modules/sambaDomain.inc:383
-#: ../lib/modules/sambaDomain.inc:389 ../lib/modules/sambaDomain.inc:605
+#: ../lib/modules/sambaDomain.inc:389 ../lib/modules/sambaDomain.inc:603
 msgid "RID base"
 msgstr "RID base"
 
@@ -11559,8 +11619,8 @@ msgstr "RID settings"
 #: ../lib/modules/asteriskAccount.inc:287
 #: ../lib/modules/asteriskAccount.inc:465
 #: ../lib/modules/asteriskAccount.inc:704
-#: ../lib/modules/asteriskAccount.inc:1006
-#: ../lib/modules/asteriskAccount.inc:1278
+#: ../lib/modules/asteriskAccount.inc:1004
+#: ../lib/modules/asteriskAccount.inc:1276
 msgid "RTP hold timeout"
 msgstr "RTP hold timeout"
 
@@ -11568,12 +11628,12 @@ msgstr "RTP hold timeout"
 #: ../lib/modules/asteriskAccount.inc:286
 #: ../lib/modules/asteriskAccount.inc:458
 #: ../lib/modules/asteriskAccount.inc:699
-#: ../lib/modules/asteriskAccount.inc:1005
-#: ../lib/modules/asteriskAccount.inc:1276
+#: ../lib/modules/asteriskAccount.inc:1003
+#: ../lib/modules/asteriskAccount.inc:1274
 msgid "RTP timeout"
 msgstr "RTP timeout"
 
-#: ../lib/modules/customFields.inc:3105
+#: ../lib/modules/customFields.inc:3103
 msgid "Radio buttons"
 msgstr "Radio buttons"
 
@@ -11581,32 +11641,32 @@ msgstr "Radio buttons"
 msgid "Radius profile for this user."
 msgstr "Radius profile for this user."
 
-#: ../lib/modules/range.inc:97 ../lib/modules/range.inc:514
-#: ../lib/modules/range.inc:574
+#: ../lib/modules/range.inc:100 ../lib/modules/range.inc:517
+#: ../lib/modules/range.inc:577
 msgid "Range from"
 msgstr "Range from"
 
-#: ../lib/modules/range.inc:101 ../lib/modules/range.inc:527
-#: ../lib/modules/range.inc:576
+#: ../lib/modules/range.inc:104 ../lib/modules/range.inc:530
+#: ../lib/modules/range.inc:579
 msgid "Range to"
 msgstr "Range to"
 
-#: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:79
-#: ../lib/modules/range.inc:127 ../lib/modules/range.inc:772
+#: ../lib/types/dhcp.inc:95 ../lib/modules/range.inc:82
+#: ../lib/modules/range.inc:130 ../lib/modules/range.inc:773
 msgid "Ranges"
 msgstr "Ranges"
 
-#: ../templates/config/confmain.php:355
+#: ../templates/config/confmain.php:358
 msgid "Read"
 msgstr "Read"
 
-#: ../templates/config/confmain.php:274 ../templates/config/conftypes.php:318
-#: ../lib/modules/customFields.inc:104 ../lib/modules/customFields.inc:1746
+#: ../templates/config/confmain.php:277 ../templates/config/conftypes.php:338
+#: ../lib/modules/customFields.inc:104 ../lib/modules/customFields.inc:1744
 #: ../help/help.inc:184
 msgid "Read-only"
 msgstr "Read-only"
 
-#: ../lib/modules/inetOrgPerson.inc:3712
+#: ../lib/modules/inetOrgPerson.inc:3692
 msgid "Read-only fields"
 msgstr "Read-only fields"
 
@@ -11626,7 +11686,7 @@ msgstr "Really delete value from this attribute?"
 #: ../lib/modules/mitKerberos.inc:194 ../lib/modules/freeRadius.inc:96
 #: ../lib/modules/freeRadius.inc:142 ../lib/modules/freeRadius.inc:190
 #: ../lib/modules/freeRadius.inc:261 ../lib/modules/freeRadius.inc:310
-#: ../lib/modules/freeRadius.inc:355 ../lib/modules/freeRadius.inc:697
+#: ../lib/modules/freeRadius.inc:355 ../lib/modules/freeRadius.inc:695
 #: ../lib/modules/heimdalKerberos.inc:98
 #: ../lib/modules/heimdalKerberos.inc:157
 #: ../lib/modules/heimdalKerberos.inc:163
@@ -11643,7 +11703,7 @@ msgstr "Recipient is invalid!"
 
 #: ../lib/types/mailAlias.inc:92 ../lib/modules/nisMailAlias.inc:89
 #: ../lib/modules/nisMailAlias.inc:108 ../lib/modules/nisMailAlias.inc:116
-#: ../lib/modules/nisMailAlias.inc:476
+#: ../lib/modules/nisMailAlias.inc:474
 msgid "Recipient list"
 msgstr "Recipient list"
 
@@ -11655,7 +11715,7 @@ msgstr "Recipients"
 #: ../lib/modules/sambaSamAccount.inc:245
 #: ../lib/modules/sambaSamAccount.inc:388
 #: ../lib/modules/sambaSamAccount.inc:1506
-#: ../lib/modules/sambaSamAccount.inc:1985
+#: ../lib/modules/sambaSamAccount.inc:1983
 msgid "Reconnect if disconnected"
 msgstr "Reconnect if disconnected"
 
@@ -11677,14 +11737,14 @@ msgstr "Recursively copy all children of this object as well."
 
 #: ../templates/config/profmanage.php:237
 #: ../templates/config/profmanage.php:292
-#: ../templates/config/mainmanage.php:476 ../templates/config/confmain.php:530
+#: ../templates/config/mainmanage.php:476 ../templates/config/confmain.php:565
 #: ../lib/modules/selfRegistration.inc:436
-#: ../lib/modules/sambaSamAccount.inc:2316
-#: ../lib/modules/posixAccount.inc:2749 ../lib/modules/windowsUser.inc:2601
+#: ../lib/modules/sambaSamAccount.inc:2314
+#: ../lib/modules/posixAccount.inc:2747 ../lib/modules/windowsUser.inc:2599
 msgid "Reenter password"
 msgstr "Reenter password"
 
-#: ../templates/serverInfo.php:187
+#: ../templates/serverInfo.php:188
 msgid "Referrals"
 msgstr "Referrals"
 
@@ -11693,7 +11753,7 @@ msgstr "Referrals"
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1054
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1055
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:249
-#: ../lib/modules/asteriskExtension.inc:454 ../lib/lists.inc:807
+#: ../lib/modules/asteriskExtension.inc:456 ../lib/lists.inc:808
 msgid "Refresh"
 msgstr "Refresh"
 
@@ -11702,9 +11762,9 @@ msgstr "Refresh"
 msgid "Refresh this entry"
 msgstr "Refresh this entry"
 
-#: ../lib/modules/bindDLZ.inc:215 ../lib/modules/bindDLZ.inc:320
-#: ../lib/modules/bindDLZ.inc:424 ../lib/modules/bindDLZ.inc:521
-#: ../lib/modules/bindDLZ.inc:1026 ../lib/modules/bindDLZ.inc:1549
+#: ../lib/modules/bindDLZ.inc:218 ../lib/modules/bindDLZ.inc:323
+#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:524
+#: ../lib/modules/bindDLZ.inc:1029 ../lib/modules/bindDLZ.inc:1550
 msgid "Refresh time"
 msgstr "Refresh time"
 
@@ -11716,16 +11776,16 @@ msgstr "Refreshing tree"
 msgid "Register new account"
 msgstr "Register new account"
 
-#: ../lib/modules/inetOrgPerson.inc:87 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:202 ../lib/modules/inetOrgPerson.inc:410
-#: ../lib/modules/inetOrgPerson.inc:580 ../lib/modules/inetOrgPerson.inc:712
-#: ../lib/modules/inetOrgPerson.inc:1403 ../lib/modules/inetOrgPerson.inc:1991
-#: ../lib/modules/inetOrgPerson.inc:2624 ../lib/modules/inetOrgPerson.inc:3656
-#: ../lib/modules/inetOrgPerson.inc:3718
+#: ../lib/modules/inetOrgPerson.inc:85 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:200 ../lib/modules/inetOrgPerson.inc:408
+#: ../lib/modules/inetOrgPerson.inc:578 ../lib/modules/inetOrgPerson.inc:710
+#: ../lib/modules/inetOrgPerson.inc:1401 ../lib/modules/inetOrgPerson.inc:1987
+#: ../lib/modules/inetOrgPerson.inc:2620 ../lib/modules/inetOrgPerson.inc:3636
+#: ../lib/modules/inetOrgPerson.inc:3698
 msgid "Registered address"
 msgstr "Registered address"
 
-#: ../lib/modules/inetOrgPerson.inc:713
+#: ../lib/modules/inetOrgPerson.inc:711
 msgid "Registered address, city"
 msgstr "Registered address, city"
 
@@ -11733,8 +11793,8 @@ msgstr "Registered address, city"
 #: ../lib/modules/asteriskAccount.inc:292
 #: ../lib/modules/asteriskAccount.inc:501
 #: ../lib/modules/asteriskAccount.inc:725
-#: ../lib/modules/asteriskAccount.inc:1011
-#: ../lib/modules/asteriskAccount.inc:1288
+#: ../lib/modules/asteriskAccount.inc:1009
+#: ../lib/modules/asteriskAccount.inc:1286
 msgid "Registration context"
 msgstr "Registration context"
 
@@ -11742,8 +11802,8 @@ msgstr "Registration context"
 #: ../lib/modules/asteriskAccount.inc:293
 #: ../lib/modules/asteriskAccount.inc:508
 #: ../lib/modules/asteriskAccount.inc:729
-#: ../lib/modules/asteriskAccount.inc:1012
-#: ../lib/modules/asteriskAccount.inc:1290
+#: ../lib/modules/asteriskAccount.inc:1010
+#: ../lib/modules/asteriskAccount.inc:1288
 msgid "Registration extension"
 msgstr "Registration extension"
 
@@ -11751,12 +11811,12 @@ msgstr "Registration extension"
 #: ../lib/modules/asteriskAccount.inc:297
 #: ../lib/modules/asteriskAccount.inc:537
 #: ../lib/modules/asteriskAccount.inc:754
-#: ../lib/modules/asteriskAccount.inc:1016
-#: ../lib/modules/asteriskAccount.inc:1298
+#: ../lib/modules/asteriskAccount.inc:1014
+#: ../lib/modules/asteriskAccount.inc:1296
 msgid "Registration server"
 msgstr "Registration server"
 
-#: ../lib/modules/kolabUser.inc:53
+#: ../lib/modules/kolabUser.inc:56
 msgid "Reject if conflicts"
 msgstr "Reject if conflicts"
 
@@ -11764,20 +11824,20 @@ msgstr "Reject if conflicts"
 msgid "Reloading"
 msgstr "Reloading"
 
-#: ../templates/login.php:440
+#: ../templates/login.php:448
 msgid "Remember user name"
 msgstr "Remember user name"
 
-#: ../templates/pdfedit/pdfpage.php:481 ../lib/modules/locking389ds.inc:158
+#: ../templates/pdfedit/pdfpage.php:496 ../lib/modules/locking389ds.inc:158
 #: ../lib/modules/mitKerberos.inc:691 ../lib/modules/qmailUser.inc:926
 #: ../lib/modules/windowsHost.inc:158 ../lib/modules/sambaSamAccount.inc:1425
 #: ../lib/modules/windowsUser.inc:1599 ../lib/modules/windowsUser.inc:1862
-#: ../lib/modules/kolabUser.inc:838 ../lib/modules/shadowAccount.inc:488
+#: ../lib/modules/kolabUser.inc:839 ../lib/modules/shadowAccount.inc:488
 #: ../lib/modules/shadowAccount.inc:541 ../lib/modules/freeRadius.inc:564
 #: ../lib/modules/sudoRole.inc:318 ../lib/modules/sudoRole.inc:345
 #: ../lib/modules/sudoRole.inc:372 ../lib/modules/sudoRole.inc:399
 #: ../lib/modules/sudoRole.inc:426 ../lib/modules/sudoRole.inc:453
-#: ../lib/modules/heimdalKerberos.inc:601 ../lib/modules/windowsGroup.inc:371
+#: ../lib/modules/heimdalKerberos.inc:601 ../lib/modules/windowsGroup.inc:374
 msgid "Remove"
 msgstr "Remove"
 
@@ -11805,15 +11865,15 @@ msgstr "Remove IP address extension"
 msgid "Remove Kerberos extension"
 msgstr "Remove Kerberos extension"
 
-#: ../lib/modules/puppetClient.inc:289
+#: ../lib/modules/puppetClient.inc:292
 msgid "Remove Puppet extension"
 msgstr "Remove Puppet extension"
 
-#: ../lib/modules/pykotaGroup.inc:238 ../lib/modules/pykotaUser.inc:418
+#: ../lib/modules/pykotaGroup.inc:238 ../lib/modules/pykotaUser.inc:421
 msgid "Remove PyKota extension"
 msgstr "Remove PyKota extension"
 
-#: ../lib/modules/ldapPublicKey.inc:154
+#: ../lib/modules/ldapPublicKey.inc:157
 msgid "Remove SSH public key extension"
 msgstr "Remove SSH public key extension"
 
@@ -11831,7 +11891,7 @@ msgid "Remove Unix extension"
 msgstr "Remove Unix extension"
 
 #: ../lib/modules/zarafaContact.inc:285 ../lib/modules/zarafaGroup.inc:297
-#: ../lib/modules/zarafaUser.inc:686 ../lib/modules/zarafaServer.inc:232
+#: ../lib/modules/zarafaUser.inc:689 ../lib/modules/zarafaServer.inc:232
 msgid "Remove Zarafa extension"
 msgstr "Remove Zarafa extension"
 
@@ -11856,7 +11916,7 @@ msgid "Remove mail routing extension"
 msgstr "Remove mail routing extension"
 
 #: ../lib/modules/posixGroup.inc:210 ../lib/modules/posixAccount.inc:1489
-#: ../lib/modules/inetOrgPerson.inc:1653
+#: ../lib/modules/inetOrgPerson.inc:1651
 msgid "Remove password"
 msgstr "Remove password"
 
@@ -11870,15 +11930,15 @@ msgstr "Remove qmail extension"
 
 #: ../templates/3rdParty/pla/htdocs/modify_member_form.php:147
 #: ../lib/modules/zarafaContact.inc:461 ../lib/modules/zarafaGroup.inc:471
-#: ../lib/modules/device.inc:281 ../lib/modules/zarafaUser.inc:950
-#: ../lib/modules/inetOrgPerson.inc:1828 ../lib/modules/qmailGroup.inc:850
-#: ../lib/modules/organizationalRole.inc:389
-#: ../lib/modules/windowsGroup.inc:714 ../lib/modules/groupOfNames.inc:448
-#: ../lib/modules/groupOfNames.inc:603
+#: ../lib/modules/device.inc:284 ../lib/modules/zarafaUser.inc:953
+#: ../lib/modules/inetOrgPerson.inc:1826 ../lib/modules/qmailGroup.inc:850
+#: ../lib/modules/organizationalRole.inc:392
+#: ../lib/modules/windowsGroup.inc:717 ../lib/modules/groupOfNames.inc:451
+#: ../lib/modules/groupOfNames.inc:606
 msgid "Remove selected entries"
 msgstr "Remove selected entries"
 
-#: ../templates/config/conftypes.php:261
+#: ../templates/config/conftypes.php:280
 msgid "Remove this account type"
 msgstr "Remove this account type"
 
@@ -11887,11 +11947,11 @@ msgstr "Remove this account type"
 msgid "Remove user from alias entry."
 msgstr "Remove user from alias entry."
 
-#: ../lib/modules/inetOrgPerson.inc:2731
+#: ../lib/modules/inetOrgPerson.inc:2727
 msgid "Remove/replace photo"
 msgstr "Remove/replace photo"
 
-#: ../lib/modules/posixGroup.inc:928
+#: ../lib/modules/posixGroup.inc:926
 msgid "Removed users"
 msgstr "Removed users"
 
@@ -11940,13 +12000,13 @@ msgstr "Renaming"
 
 #: ../lib/modules/mitKerberos.inc:132 ../lib/modules/mitKerberos.inc:196
 #: ../lib/modules/mitKerberos.inc:236 ../lib/modules/mitKerberos.inc:253
-#: ../lib/modules/mitKerberos.inc:366 ../lib/modules/mitKerberos.inc:785
+#: ../lib/modules/mitKerberos.inc:366 ../lib/modules/mitKerberos.inc:783
 #: ../lib/modules/heimdalKerberos.inc:114
 #: ../lib/modules/heimdalKerberos.inc:165
 #: ../lib/modules/heimdalKerberos.inc:205
 #: ../lib/modules/heimdalKerberos.inc:222
 #: ../lib/modules/heimdalKerberos.inc:313
-#: ../lib/modules/heimdalKerberos.inc:705
+#: ../lib/modules/heimdalKerberos.inc:703
 msgid "Renewable lifetime"
 msgstr "Renewable lifetime"
 
@@ -11956,8 +12016,8 @@ msgstr "Renewable lifetime"
 msgid "Renewable lifetime must be a number."
 msgstr "Renewable lifetime must be a number."
 
-#: ../templates/lists/changePassword.php:374
-#: ../lib/modules/passwordSelfReset.inc:1287 ../lib/modules.inc:1072
+#: ../templates/lists/changePassword.php:375
+#: ../lib/modules/passwordSelfReset.inc:1285 ../lib/modules.inc:1080
 msgid "Repeat password"
 msgstr "Repeat password"
 
@@ -11965,25 +12025,25 @@ msgstr "Repeat password"
 msgid "Replaced $user or $group in homedir."
 msgstr "Replaced $user or $group in homedir."
 
-#: ../templates/config/confmain.php:423 ../lib/passwordExpirationJob.inc:82
-#: ../lib/passwordExpirationJob.inc:125 ../help/help.inc:295
-#: ../help/help.inc:320
+#: ../templates/config/confmain.php:426 ../lib/passwordExpirationJob.inc:82
+#: ../lib/passwordExpirationJob.inc:125 ../help/help.inc:307
+#: ../help/help.inc:332
 msgid "Reply-to address"
 msgstr "Reply-to address"
 
-#: ../templates/config/confmain.php:626
+#: ../templates/config/confmain.php:663
 msgid "Reply-to address for password mails is invalid."
 msgstr "Reply-to address for password mails is invalid."
 
 #: ../lib/types/ppolicyType.inc:89 ../lib/modules/ppolicy.inc:128
 #: ../lib/modules/ppolicy.inc:154 ../lib/modules/ppolicy.inc:283
-#: ../lib/modules/ppolicy.inc:501
+#: ../lib/modules/ppolicy.inc:499
 msgid "Require password change on first login"
 msgstr "Require password change on first login"
 
 #: ../lib/modules/windowsUser.inc:219 ../lib/modules/windowsUser.inc:542
 #: ../lib/modules/windowsUser.inc:836 ../lib/modules/windowsUser.inc:1194
-#: ../lib/modules/windowsUser.inc:2478
+#: ../lib/modules/windowsUser.inc:2476
 msgid "Require smartcard"
 msgstr "Require smartcard"
 
@@ -11991,7 +12051,7 @@ msgstr "Require smartcard"
 msgid "Required attribute for object classes"
 msgstr "Required attribute for object classes"
 
-#: ../templates/schema/schema.php:383
+#: ../templates/schema/schema.php:384
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1567
 msgid "Required attributes"
 msgstr "Required attributes"
@@ -12012,7 +12072,7 @@ msgstr "Requires preauthentication"
 msgid "Reset"
 msgstr "Reset"
 
-#: ../lib/modules.inc:1244
+#: ../lib/modules.inc:1252
 msgid "Reset changes"
 msgstr "Reset changes"
 
@@ -12023,7 +12083,7 @@ msgstr "Reset password"
 
 #: ../lib/modules/sambaDomain.inc:137 ../lib/modules/sambaDomain.inc:199
 #: ../lib/modules/sambaDomain.inc:224 ../lib/modules/sambaDomain.inc:348
-#: ../lib/modules/sambaDomain.inc:612
+#: ../lib/modules/sambaDomain.inc:610
 msgid "Reset time after lockout"
 msgstr "Reset time after lockout"
 
@@ -12035,7 +12095,7 @@ msgstr "Reset time after lockout must be are natural number."
 msgid "Resets the billing code's balance and page counter to 0."
 msgstr "Resets the billing code's balance and page counter to 0."
 
-#: ../lib/modules/zarafaUser.inc:552
+#: ../lib/modules/zarafaUser.inc:555
 msgid "Resource settings"
 msgstr "Resource settings"
 
@@ -12043,8 +12103,8 @@ msgstr "Resource settings"
 #: ../lib/modules/asteriskAccount.inc:285
 #: ../lib/modules/asteriskAccount.inc:450
 #: ../lib/modules/asteriskAccount.inc:695
-#: ../lib/modules/asteriskAccount.inc:1004
-#: ../lib/modules/asteriskAccount.inc:1274
+#: ../lib/modules/asteriskAccount.inc:1002
+#: ../lib/modules/asteriskAccount.inc:1272
 msgid "Restrict caller ID"
 msgstr "Restrict caller ID"
 
@@ -12069,27 +12129,27 @@ msgstr "Retrieving DN"
 msgid "Retry count"
 msgstr "Retry count"
 
-#: ../lib/modules/bindDLZ.inc:219 ../lib/modules/bindDLZ.inc:332
-#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:523
-#: ../lib/modules/bindDLZ.inc:1037 ../lib/modules/bindDLZ.inc:1550
+#: ../lib/modules/bindDLZ.inc:222 ../lib/modules/bindDLZ.inc:335
+#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:1040 ../lib/modules/bindDLZ.inc:1551
 msgid "Retry time"
 msgstr "Retry time"
 
-#: ../lib/modules/bindDLZ.inc:755
+#: ../lib/modules/bindDLZ.inc:758
 msgid "Reverse DNS entries (\"PTR\" records)"
 msgstr "Reverse DNS entries (\"PTR\" records)"
 
 #: ../lib/modules/ddns.inc:106 ../lib/modules/ddns.inc:114
 #: ../lib/modules/ddns.inc:135 ../lib/modules/ddns.inc:397
-#: ../lib/modules/ddns.inc:427
+#: ../lib/modules/ddns.inc:425
 msgid "Reverse zone name"
 msgstr "Reverse zone name"
 
-#: ../templates/config/confmain.php:351 ../help/help.inc:120
+#: ../templates/config/confmain.php:354 ../help/help.inc:120
 msgid "Rights for the home directory"
 msgstr "Rights for the home directory"
 
-#: ../lib/modules/organizationalRole.inc:65
+#: ../lib/modules/organizationalRole.inc:68
 msgid "Role"
 msgstr "Role"
 
@@ -12105,7 +12165,7 @@ msgstr "Role member DNs"
 #: ../lib/types/gon.inc:112 ../lib/types/group.inc:117
 #: ../lib/types/sudo.inc:77 ../lib/modules/sudoRole.inc:66
 #: ../lib/modules/sudoRole.inc:146 ../lib/modules/sudoRole.inc:214
-#: ../lib/modules/sudoRole.inc:299 ../lib/modules/sudoRole.inc:753
+#: ../lib/modules/sudoRole.inc:299 ../lib/modules/sudoRole.inc:751
 msgid "Role name"
 msgstr "Role name"
 
@@ -12116,20 +12176,20 @@ msgstr "Role name"
 #: ../lib/modules/organizationalRoleUser.inc:64
 #: ../lib/modules/organizationalRoleUser.inc:71
 #: ../lib/modules/organizationalRoleUser.inc:270
-#: ../lib/modules/organizationalRoleUser.inc:308
+#: ../lib/modules/organizationalRoleUser.inc:306
 msgid "Roles"
 msgstr "Roles"
 
-#: ../lib/modules/zarafaUser.inc:557 ../lib/modules/zarafaUser.inc:1284
+#: ../lib/modules/zarafaUser.inc:560 ../lib/modules/zarafaUser.inc:1285
 msgid "Room"
 msgstr "Room"
 
-#: ../lib/modules/inetOrgPerson.inc:163 ../lib/modules/inetOrgPerson.inc:208
-#: ../lib/modules/inetOrgPerson.inc:492 ../lib/modules/inetOrgPerson.inc:586
-#: ../lib/modules/inetOrgPerson.inc:787 ../lib/modules/inetOrgPerson.inc:1447
-#: ../lib/modules/inetOrgPerson.inc:1450 ../lib/modules/inetOrgPerson.inc:1999
-#: ../lib/modules/inetOrgPerson.inc:2657 ../lib/modules/inetOrgPerson.inc:3660
-#: ../lib/modules/inetOrgPerson.inc:3719
+#: ../lib/modules/inetOrgPerson.inc:161 ../lib/modules/inetOrgPerson.inc:206
+#: ../lib/modules/inetOrgPerson.inc:490 ../lib/modules/inetOrgPerson.inc:584
+#: ../lib/modules/inetOrgPerson.inc:785 ../lib/modules/inetOrgPerson.inc:1445
+#: ../lib/modules/inetOrgPerson.inc:1448 ../lib/modules/inetOrgPerson.inc:1995
+#: ../lib/modules/inetOrgPerson.inc:2653 ../lib/modules/inetOrgPerson.inc:3640
+#: ../lib/modules/inetOrgPerson.inc:3699
 msgid "Room number"
 msgstr "Room number"
 
@@ -12137,16 +12197,16 @@ msgstr "Room number"
 #: ../lib/modules/inetLocalMailRecipient.inc:112
 #: ../lib/modules/inetLocalMailRecipient.inc:131
 #: ../lib/modules/inetLocalMailRecipient.inc:175
-#: ../lib/modules/inetLocalMailRecipient.inc:354
+#: ../lib/modules/inetLocalMailRecipient.inc:352
 msgid "Routing address"
 msgstr "Routing address"
 
-#: ../lib/modules/customFields.inc:136 ../lib/modules/customFields.inc:2745
+#: ../lib/modules/customFields.inc:136 ../lib/modules/customFields.inc:2743
 msgid "Rows"
 msgstr "Rows"
 
-#: ../lib/modules/asteriskExtension.inc:139
-#: ../lib/modules/asteriskExtension.inc:311
+#: ../lib/modules/asteriskExtension.inc:141
+#: ../lib/modules/asteriskExtension.inc:313
 msgid "Rules"
 msgstr "Rules"
 
@@ -12161,7 +12221,7 @@ msgstr "Run group"
 #: ../lib/modules/sudoRole.inc:90 ../lib/modules/sudoRole.inc:118
 #: ../lib/modules/sudoRole.inc:183 ../lib/modules/sudoRole.inc:220
 #: ../lib/modules/sudoRole.inc:232 ../lib/modules/sudoRole.inc:424
-#: ../lib/modules/sudoRole.inc:759
+#: ../lib/modules/sudoRole.inc:757
 msgid "Run groups"
 msgstr "Run groups"
 
@@ -12172,7 +12232,7 @@ msgstr "Run user"
 #: ../lib/modules/sudoRole.inc:86 ../lib/modules/sudoRole.inc:113
 #: ../lib/modules/sudoRole.inc:177 ../lib/modules/sudoRole.inc:219
 #: ../lib/modules/sudoRole.inc:231 ../lib/modules/sudoRole.inc:397
-#: ../lib/modules/sudoRole.inc:758
+#: ../lib/modules/sudoRole.inc:756
 msgid "Run users"
 msgstr "Run users"
 
@@ -12180,7 +12240,7 @@ msgstr "Run users"
 msgid "S.M."
 msgstr "S.M."
 
-#: ../templates/serverInfo.php:129
+#: ../templates/serverInfo.php:130
 msgid "SASL mechanisms"
 msgstr "SASL mechanisms"
 
@@ -12192,18 +12252,18 @@ msgstr "SIP URI for a realtime peer."
 msgid "SIP user agent identification."
 msgstr "SIP user agent identification."
 
-#: ../lib/modules/bindDLZ.inc:314 ../lib/modules/bindDLZ.inc:320
-#: ../lib/modules/bindDLZ.inc:326 ../lib/modules/bindDLZ.inc:332
-#: ../lib/modules/bindDLZ.inc:338 ../lib/modules/bindDLZ.inc:345
-#: ../lib/modules/bindDLZ.inc:351 ../lib/modules/bindDLZ.inc:357
-#: ../lib/modules/bindDLZ.inc:423 ../lib/modules/bindDLZ.inc:424
-#: ../lib/modules/bindDLZ.inc:425 ../lib/modules/bindDLZ.inc:426
-#: ../lib/modules/bindDLZ.inc:427 ../lib/modules/bindDLZ.inc:428
-#: ../lib/modules/bindDLZ.inc:429 ../lib/modules/bindDLZ.inc:430
-#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:519
-#: ../lib/modules/bindDLZ.inc:521 ../lib/modules/bindDLZ.inc:523
-#: ../lib/modules/bindDLZ.inc:525 ../lib/modules/bindDLZ.inc:527
-#: ../lib/modules/bindDLZ.inc:529
+#: ../lib/modules/bindDLZ.inc:317 ../lib/modules/bindDLZ.inc:323
+#: ../lib/modules/bindDLZ.inc:329 ../lib/modules/bindDLZ.inc:335
+#: ../lib/modules/bindDLZ.inc:341 ../lib/modules/bindDLZ.inc:348
+#: ../lib/modules/bindDLZ.inc:354 ../lib/modules/bindDLZ.inc:360
+#: ../lib/modules/bindDLZ.inc:426 ../lib/modules/bindDLZ.inc:427
+#: ../lib/modules/bindDLZ.inc:428 ../lib/modules/bindDLZ.inc:429
+#: ../lib/modules/bindDLZ.inc:430 ../lib/modules/bindDLZ.inc:431
+#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:433
+#: ../lib/modules/bindDLZ.inc:490 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:530
+#: ../lib/modules/bindDLZ.inc:532
 msgid "SOA record"
 msgstr "SOA record"
 
@@ -12211,42 +12271,42 @@ msgstr "SOA record"
 msgid "SQLite"
 msgstr "SQLite"
 
-#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:389
-#: ../lib/modules/bindDLZ.inc:394 ../lib/modules/bindDLZ.inc:399
-#: ../lib/modules/bindDLZ.inc:404 ../lib/modules/bindDLZ.inc:409
-#: ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:133 ../lib/modules/bindDLZ.inc:392
+#: ../lib/modules/bindDLZ.inc:397 ../lib/modules/bindDLZ.inc:402
+#: ../lib/modules/bindDLZ.inc:407 ../lib/modules/bindDLZ.inc:412
+#: ../lib/modules/bindDLZ.inc:496
 msgid "SRV record"
 msgstr "SRV record"
 
-#: ../lib/modules/bindDLZ.inc:433 ../lib/modules/bindDLZ.inc:443
-#: ../lib/modules/bindDLZ.inc:1600
+#: ../lib/modules/bindDLZ.inc:436 ../lib/modules/bindDLZ.inc:446
+#: ../lib/modules/bindDLZ.inc:1601
 msgid "SRV records"
 msgstr "SRV records"
 
-#: ../templates/tests/lamdaemonTest.php:248
+#: ../templates/tests/lamdaemonTest.php:250
 msgid "SSH connection"
 msgstr "SSH connection"
 
-#: ../templates/tests/lamdaemonTest.php:256
+#: ../templates/tests/lamdaemonTest.php:258
 msgid "SSH connection established."
 msgstr "SSH connection established."
 
-#: ../templates/config/confmain.php:345 ../help/help.inc:216
+#: ../templates/config/confmain.php:348 ../help/help.inc:216
 msgid "SSH key file"
 msgstr "SSH key file"
 
-#: ../templates/config/confmain.php:346 ../help/help.inc:218
+#: ../templates/config/confmain.php:349 ../help/help.inc:218
 msgid "SSH key password"
 msgstr "SSH key password"
 
-#: ../lib/modules/ldapPublicKey.inc:73 ../lib/modules/ldapPublicKey.inc:83
-#: ../lib/modules/ldapPublicKey.inc:87 ../lib/modules/ldapPublicKey.inc:107
-#: ../lib/modules/ldapPublicKey.inc:140
+#: ../lib/modules/ldapPublicKey.inc:76 ../lib/modules/ldapPublicKey.inc:86
+#: ../lib/modules/ldapPublicKey.inc:90 ../lib/modules/ldapPublicKey.inc:110
+#: ../lib/modules/ldapPublicKey.inc:143
 msgid "SSH public key"
 msgstr "SSH public key"
 
-#: ../lib/modules/ldapPublicKey.inc:114 ../lib/modules/ldapPublicKey.inc:118
-#: ../lib/modules/ldapPublicKey.inc:290 ../lib/modules/ldapPublicKey.inc:332
+#: ../lib/modules/ldapPublicKey.inc:117 ../lib/modules/ldapPublicKey.inc:121
+#: ../lib/modules/ldapPublicKey.inc:291 ../lib/modules/ldapPublicKey.inc:333
 msgid "SSH public keys"
 msgstr "SSH public keys"
 
@@ -12260,12 +12320,12 @@ msgstr "SSL certificates"
 
 #: ../lib/modules/zarafaServer.inc:72 ../lib/modules/zarafaServer.inc:106
 #: ../lib/modules/zarafaServer.inc:136 ../lib/modules/zarafaServer.inc:175
-#: ../lib/modules/zarafaServer.inc:203 ../lib/modules/zarafaServer.inc:358
+#: ../lib/modules/zarafaServer.inc:203 ../lib/modules/zarafaServer.inc:356
 msgid "SSL port"
 msgstr "SSL port"
 
-#: ../templates/lists/changePassword.php:421
-#: ../templates/lists/changePassword.php:461
+#: ../templates/lists/changePassword.php:422
+#: ../templates/lists/changePassword.php:462
 msgid "Samba"
 msgstr "Samba"
 
@@ -12284,14 +12344,14 @@ msgstr "Samba 3 domain SID is invalid!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 domain entries"
 
-#: ../lib/modules/posixGroup.inc:568 ../lib/modules/posixAccount.inc:1889
+#: ../lib/modules/posixGroup.inc:568 ../lib/modules/posixAccount.inc:1887
 msgid "Samba ID pool"
 msgstr "Samba ID pool"
 
 #: ../lib/modules/posixGroup.inc:521 ../lib/modules/posixGroup.inc:593
-#: ../lib/modules/posixGroup.inc:673 ../lib/modules/posixAccount.inc:131
-#: ../lib/modules/posixAccount.inc:444 ../lib/modules/posixAccount.inc:1908
-#: ../lib/modules/posixAccount.inc:1945
+#: ../lib/modules/posixGroup.inc:671 ../lib/modules/posixAccount.inc:131
+#: ../lib/modules/posixAccount.inc:444 ../lib/modules/posixAccount.inc:1906
+#: ../lib/modules/posixAccount.inc:1943
 msgid "Samba ID pool DN"
 msgstr "Samba ID pool DN"
 
@@ -12326,7 +12386,7 @@ msgstr "Samba domains"
 #: ../lib/modules/sambaGroupMapping.inc:113
 #: ../lib/modules/sambaGroupMapping.inc:135
 #: ../lib/modules/sambaGroupMapping.inc:162
-#: ../lib/modules/sambaGroupMapping.inc:542
+#: ../lib/modules/sambaGroupMapping.inc:540
 msgid "Samba group type"
 msgstr "Samba group type"
 
@@ -12342,7 +12402,7 @@ msgstr "Samba password"
 #: ../lib/modules/sambaSamAccount.inc:1192
 #: ../lib/modules/sambaSamAccount.inc:1714
 #: ../lib/modules/sambaSamAccount.inc:1896
-#: ../lib/modules/sambaSamAccount.inc:1919
+#: ../lib/modules/sambaSamAccount.inc:1917
 msgid "Samba workstations"
 msgstr "Samba workstations"
 
@@ -12350,18 +12410,18 @@ msgstr "Samba workstations"
 msgid "Saturday"
 msgstr "Saturday"
 
-#: ../templates/config/confmodules.php:236 ../templates/config/jobList.php:251
-#: ../templates/config/jobs.php:400 ../templates/config/confmain.php:545
-#: ../templates/config/moduleSettings.php:250
-#: ../templates/config/conftypes.php:372
-#: ../templates/selfService/selfServiceMain.php:473
-#: ../templates/selfService/adminMain.php:735
-#: ../templates/pdfedit/pdfpage.php:640
-#: ../templates/profedit/profilepage.php:243
+#: ../templates/config/confmodules.php:243 ../templates/config/jobList.php:251
+#: ../templates/config/jobs.php:400 ../templates/config/confmain.php:580
+#: ../templates/config/moduleSettings.php:258
+#: ../templates/config/conftypes.php:387
+#: ../templates/selfService/selfServiceMain.php:482
+#: ../templates/selfService/adminMain.php:788
+#: ../templates/pdfedit/pdfpage.php:658
+#: ../templates/profedit/profilepage.php:255
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1243
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1247
-#: ../lib/modules/inetOrgPerson.inc:2898 ../lib/modules/customFields.inc:3669
-#: ../lib/modules.inc:1238
+#: ../lib/modules/inetOrgPerson.inc:2900 ../lib/modules/customFields.inc:3667
+#: ../lib/modules.inc:1246
 msgid "Save"
 msgstr "Save"
 
@@ -12383,22 +12443,22 @@ msgstr "Save as file"
 msgid "Save changes"
 msgstr "Save changes"
 
-#: ../lib/tools/schemaBrowser.inc:44
+#: ../lib/tools/schemaBrowser.inc:45
 msgid "Schema browser"
 msgstr "Schema browser"
 
-#: ../templates/serverInfo.php:119
+#: ../templates/serverInfo.php:120
 msgid "Schema suffix"
 msgstr "Schema suffix"
 
-#: ../templates/tests/schemaTest.php:55 ../templates/tests/index.php:58
-#: ../lib/tools/tests.inc:116
+#: ../templates/tests/schemaTest.php:56 ../templates/tests/index.php:59
+#: ../lib/tools/tests.inc:117
 msgid "Schema test"
 msgstr "Schema test"
 
 #: ../lib/modules/eduPerson.inc:92 ../lib/modules/eduPerson.inc:96
 #: ../lib/modules/eduPerson.inc:175 ../lib/modules/eduPerson.inc:233
-#: ../lib/modules/eduPerson.inc:285 ../lib/modules/eduPerson.inc:559
+#: ../lib/modules/eduPerson.inc:285 ../lib/modules/eduPerson.inc:557
 msgid "Scoped affiliations"
 msgstr "Scoped affiliations"
 
@@ -12406,15 +12466,15 @@ msgstr "Scoped affiliations"
 msgid "Script path"
 msgstr "Script path"
 
-#: ../templates/config/confmain.php:677
+#: ../templates/config/confmain.php:714
 msgid "Script path is invalid!"
 msgstr "Script path is invalid!"
 
-#: ../templates/config/confmain.php:696
+#: ../templates/config/confmain.php:733
 msgid "Script rights are invalid!"
 msgstr "Script rights are invalid!"
 
-#: ../templates/config/confmain.php:680
+#: ../templates/config/confmain.php:717
 msgid "Script server is invalid!"
 msgstr "Script server is invalid!"
 
@@ -12422,7 +12482,7 @@ msgstr "Script server is invalid!"
 msgid "Script servers"
 msgstr "Script servers"
 
-#: ../templates/serverInfo.php:300 ../templates/serverInfo.php:380
+#: ../templates/serverInfo.php:301 ../templates/serverInfo.php:381
 #: ../templates/3rdParty/pla/lib/QueryRender.php:75
 #: ../templates/3rdParty/pla/lib/QueryRender.php:180
 #: ../templates/3rdParty/pla/lib/ds_ldap_pla.php:619
@@ -12451,15 +12511,15 @@ msgstr "Search returned no results"
 msgid "Search scope"
 msgstr "Search scope"
 
-#: ../lib/modules/asteriskExtension.inc:457
+#: ../lib/modules/asteriskExtension.inc:459
 msgid "Search tree suffix for users"
 msgstr "Search tree suffix for users"
 
-#: ../templates/pdfedit/pdfpage.php:612
+#: ../templates/pdfedit/pdfpage.php:628
 msgid "Section"
 msgstr "Section"
 
-#: ../lib/modules/windowsGroup.inc:62
+#: ../lib/modules/windowsGroup.inc:65
 msgid "Security"
 msgstr "Security"
 
@@ -12474,11 +12534,11 @@ msgstr "Security error: The file being uploaded may be malicious."
 
 #: ../lib/modules/zarafaGroup.inc:86 ../lib/modules/zarafaGroup.inc:161
 #: ../lib/modules/zarafaGroup.inc:186 ../lib/modules/zarafaGroup.inc:275
-#: ../lib/modules/zarafaGroup.inc:634
+#: ../lib/modules/zarafaGroup.inc:632
 msgid "Security group"
 msgstr "Security group"
 
-#: ../lib/modules/windowsGroup.inc:145
+#: ../lib/modules/windowsGroup.inc:148
 msgid ""
 "Security groups are used for permission management and distribution groups "
 "as email lists."
@@ -12488,11 +12548,11 @@ msgstr ""
 
 #: ../lib/modules/passwordSelfReset.inc:84
 #: ../lib/modules/passwordSelfReset.inc:295
-#: ../lib/modules/passwordSelfReset.inc:667
+#: ../lib/modules/passwordSelfReset.inc:665
 msgid "Security questions"
 msgstr "Security questions"
 
-#: ../templates/config/mainmanage.php:312 ../templates/config/confmain.php:535
+#: ../templates/config/mainmanage.php:312 ../templates/config/confmain.php:570
 msgid "Security settings"
 msgstr "Security settings"
 
@@ -12500,7 +12560,7 @@ msgstr "Security settings"
 msgid "See also"
 msgstr "See also"
 
-#: ../lib/account.inc:865
+#: ../lib/account.inc:871
 msgid "See the manual for instructions to solve this problem."
 msgstr "See the manual for instructions to solve this problem."
 
@@ -12512,7 +12572,7 @@ msgstr "Select a template for the creation process"
 msgid "Select a template to edit the entry"
 msgstr "Select a template to edit the entry"
 
-#: ../lib/lists.inc:359 ../lib/lists.inc:486
+#: ../lib/lists.inc:361 ../lib/lists.inc:488
 msgid "Select all"
 msgstr "Select all"
 
@@ -12520,11 +12580,11 @@ msgstr "Select all"
 msgid "Select an LDIF file"
 msgstr "Select an LDIF file"
 
-#: ../lib/modules/nisnetgroup.inc:240 ../lib/modules/nisnetgroup.inc:269
+#: ../lib/modules/nisnetgroup.inc:243 ../lib/modules/nisnetgroup.inc:272
 msgid "Select host"
 msgstr "Select host"
 
-#: ../lib/modules/customFields.inc:3322
+#: ../lib/modules/customFields.inc:3320
 msgid "Select list"
 msgstr "Select list"
 
@@ -12536,18 +12596,19 @@ msgstr "Select mail"
 msgid "Select one or more alias entries from the list to add the recipient."
 msgstr "Select one or more alias entries from the list to add the recipient."
 
-#: ../lib/modules/nisnetgroup.inc:246 ../lib/modules/nisnetgroup.inc:275
+#: ../lib/modules/nisnetgroup.inc:249 ../lib/modules/nisnetgroup.inc:278
 #: ../lib/modules/nisMailAlias.inc:195 ../lib/modules/nisMailAlias.inc:216
 msgid "Select user"
 msgstr "Select user"
 
 #: ../lib/modules/posixAccount.inc:1559 ../lib/modules/posixAccount.inc:1592
-#: ../lib/modules/windowsUser.inc:1684 ../lib/modules/nisnetgroup.inc:384
-#: ../lib/modules/groupOfNamesUser.inc:131 ../lib/modules/windowsGroup.inc:521
+#: ../lib/modules/windowsUser.inc:1684 ../lib/modules/nisnetgroup.inc:387
+#: ../lib/modules/groupOfNamesUser.inc:131 ../lib/modules/windowsGroup.inc:524
 msgid "Selected groups"
 msgstr "Selected groups"
 
-#: ../templates/masscreate.php:158 ../templates/config/confmodules.php:306
+#: ../templates/config/confmodules.php:312
+#: ../templates/upload/masscreate.php:183
 msgid "Selected modules"
 msgstr "Selected modules"
 
@@ -12555,47 +12616,47 @@ msgstr "Selected modules"
 msgid "Selected roles"
 msgstr "Selected roles"
 
-#: ../lib/modules/posixGroup.inc:297 ../lib/modules/asteriskExtension.inc:461
+#: ../lib/modules/posixGroup.inc:297 ../lib/modules/asteriskExtension.inc:463
 msgid "Selected users"
 msgstr "Selected users"
 
-#: ../templates/selfService/adminMain.php:308
+#: ../templates/selfService/adminMain.php:324
 msgid "Self service configuration"
 msgstr "Self service configuration"
 
-#: ../templates/selfService/adminMain.php:361
+#: ../templates/selfService/adminMain.php:377
 msgid "Self service configuration editor"
 msgstr "Self service configuration editor"
 
-#: ../templates/selfService/adminMain.php:367
+#: ../templates/selfService/adminMain.php:383
 msgid "Self service login"
 msgstr "Self service login"
 
-#: ../lib/modules/passwordSelfReset.inc:644
+#: ../lib/modules/passwordSelfReset.inc:642
 msgid "Self service login attribute"
 msgstr "Self service login attribute"
 
-#: ../templates/selfService/adminMain.php:353
+#: ../templates/selfService/adminMain.php:369
 msgid "Self service profile"
 msgstr "Self service profile"
 
 #: ../lib/modules/passwordSelfReset.inc:134
-#: ../lib/modules/passwordSelfReset.inc:673
+#: ../lib/modules/passwordSelfReset.inc:671
 msgid "Send confirmation mail"
 msgstr "Send confirmation mail"
 
 #: ../lib/modules/passwordSelfReset.inc:116
-#: ../lib/modules/passwordSelfReset.inc:693
+#: ../lib/modules/passwordSelfReset.inc:691
 msgid "Send notification mail"
 msgstr "Send notification mail"
 
-#: ../lib/modules/inetOrgPerson.inc:473 ../lib/modules/inetOrgPerson.inc:756
+#: ../lib/modules/inetOrgPerson.inc:471 ../lib/modules/inetOrgPerson.inc:754
 msgid "Send password via mail"
 msgstr "Send password via mail"
 
-#: ../templates/lists/changePassword.php:333
-#: ../templates/lists/changePassword.php:379
-#: ../templates/config/confmain.php:398 ../lib/modules.inc:1090
+#: ../templates/lists/changePassword.php:334
+#: ../templates/lists/changePassword.php:380
+#: ../templates/config/confmain.php:401 ../lib/modules.inc:1098
 #: ../help/help.inc:246
 msgid "Send via mail"
 msgstr "Send via mail"
@@ -12603,21 +12664,21 @@ msgstr "Send via mail"
 #: ../lib/modules/qmailGroup.inc:90 ../lib/modules/qmailGroup.inc:220
 #: ../lib/modules/qmailGroup.inc:224 ../lib/modules/qmailGroup.inc:353
 #: ../lib/modules/qmailGroup.inc:408 ../lib/modules/qmailGroup.inc:429
-#: ../lib/modules/qmailGroup.inc:519 ../lib/modules/qmailGroup.inc:1018
+#: ../lib/modules/qmailGroup.inc:519 ../lib/modules/qmailGroup.inc:1016
 msgid "Sender email addresses"
 msgstr "Sender email addresses"
 
 #: ../lib/modules/qmailGroup.inc:88 ../lib/modules/qmailGroup.inc:172
 #: ../lib/modules/qmailGroup.inc:176 ../lib/modules/qmailGroup.inc:295
 #: ../lib/modules/qmailGroup.inc:387 ../lib/modules/qmailGroup.inc:521
-#: ../lib/modules/qmailGroup.inc:790 ../lib/modules/qmailGroup.inc:1017
+#: ../lib/modules/qmailGroup.inc:790 ../lib/modules/qmailGroup.inc:1015
 msgid "Sender entries"
 msgstr "Sender entries"
 
 #: ../lib/modules/qmailGroup.inc:92 ../lib/modules/qmailGroup.inc:188
 #: ../lib/modules/qmailGroup.inc:192 ../lib/modules/qmailGroup.inc:311
 #: ../lib/modules/qmailGroup.inc:393 ../lib/modules/qmailGroup.inc:520
-#: ../lib/modules/qmailGroup.inc:1019
+#: ../lib/modules/qmailGroup.inc:1017
 msgid "Sender filter"
 msgstr "Sender filter"
 
@@ -12641,7 +12702,7 @@ msgstr ""
 "Sends the old password together with the new password when the user sets a "
 "new password."
 
-#: ../lib/modules/inetOrgPerson.inc:757 ../help/help.inc:247
+#: ../lib/modules/inetOrgPerson.inc:755 ../help/help.inc:247
 msgid ""
 "Sends the password to the user via mail. Please edit your LAM server profile "
 "to setup the mail settings."
@@ -12649,70 +12710,72 @@ msgstr ""
 "Sends the password to the user via mail. Please edit your LAM server profile "
 "to setup the mail settings."
 
-#: ../templates/config/mainmanage.php:375 ../lib/env.inc:157
-#: ../lib/modules/device.inc:65 ../lib/modules/device.inc:97
-#: ../lib/modules/device.inc:127 ../lib/modules/device.inc:175
-#: ../lib/modules/device.inc:411 ../lib/modules/bindDLZ.inc:227
-#: ../lib/modules/bindDLZ.inc:357 ../lib/modules/bindDLZ.inc:423
-#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:1055
-#: ../lib/modules/bindDLZ.inc:1548
+#: ../templates/config/mainmanage.php:375
+#: ../templates/selfService/selfService2Factor.php:193
+#: ../templates/login2Factor.php:206 ../lib/env.inc:157
+#: ../lib/modules/device.inc:68 ../lib/modules/device.inc:100
+#: ../lib/modules/device.inc:130 ../lib/modules/device.inc:178
+#: ../lib/modules/device.inc:412 ../lib/modules/bindDLZ.inc:230
+#: ../lib/modules/bindDLZ.inc:360 ../lib/modules/bindDLZ.inc:426
+#: ../lib/modules/bindDLZ.inc:530 ../lib/modules/bindDLZ.inc:1058
+#: ../lib/modules/bindDLZ.inc:1549
 msgid "Serial number"
 msgstr "Serial number"
 
-#: ../templates/tests/lamdaemonTest.php:72
+#: ../templates/tests/lamdaemonTest.php:73
 #: ../templates/3rdParty/pla/lib/HTMLTree.php:166
 #: ../templates/3rdParty/pla/htdocs/import.php:47
 #: ../templates/3rdParty/pla/htdocs/delete_form.php:110
 #: ../templates/3rdParty/pla/htdocs/create_confirm.php:54
 #: ../templates/3rdParty/pla/htdocs/export_form.php:56
-#: ../lib/modules/kolabGroup.inc:289 ../lib/modules/bindDLZ.inc:171
-#: ../lib/modules/bindDLZ.inc:175 ../lib/modules/bindDLZ.inc:404
-#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:1373
-#: ../lib/modules/bindDLZ.inc:1605 ../lib/modules/kolabSharedFolder.inc:429
+#: ../lib/modules/kolabGroup.inc:289 ../lib/modules/bindDLZ.inc:174
+#: ../lib/modules/bindDLZ.inc:178 ../lib/modules/bindDLZ.inc:407
+#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:1376
+#: ../lib/modules/bindDLZ.inc:1606 ../lib/modules/kolabSharedFolder.inc:429
 msgid "Server"
 msgstr "Server"
 
-#: ../templates/config/confmain.php:250
-#: ../templates/selfService/adminMain.php:418 ../lib/modules/qmailUser.inc:118
+#: ../templates/config/confmain.php:253
+#: ../templates/selfService/adminMain.php:434 ../lib/modules/qmailUser.inc:118
 #: ../lib/modules/qmailUser.inc:163 ../lib/modules/qmailUser.inc:243
 #: ../lib/modules/qmailUser.inc:358 ../lib/modules/qmailUser.inc:427
-#: ../lib/modules/qmailUser.inc:602 ../lib/modules/qmailUser.inc:1119
+#: ../lib/modules/qmailUser.inc:602 ../lib/modules/qmailUser.inc:1117
 #: ../lib/modules/imapAccess.inc:82 ../lib/modules/imapAccess.inc:464
 #: ../help/help.inc:58
 msgid "Server address"
 msgstr "Server address"
 
-#: ../templates/config/confmain.php:578
-#: ../templates/selfService/adminMain.php:221
+#: ../templates/config/confmain.php:615
+#: ../templates/selfService/adminMain.php:232
 msgid "Server address is invalid!"
 msgstr "Server address is invalid!"
 
-#: ../templates/serverInfo.php:103 ../lib/tools/serverInfo.inc:44
+#: ../templates/serverInfo.php:104 ../lib/tools/serverInfo.inc:45
 msgid "Server information"
 msgstr "Server information"
 
-#: ../templates/config/confmain.php:341
+#: ../templates/config/confmain.php:344
 msgid "Server list"
 msgstr "Server list"
 
-#: ../templates/login.php:481 ../templates/config/confmodules.php:142
+#: ../templates/login.php:490 ../templates/config/confmodules.php:152
 #: ../templates/config/jobList.php:130 ../templates/config/jobs.php:129
-#: ../templates/config/confmain.php:172
-#: ../templates/config/moduleSettings.php:141
-#: ../templates/config/conftypes.php:160 ../lib/modules/imapAccess.inc:477
+#: ../templates/config/confmain.php:175
+#: ../templates/config/moduleSettings.php:146
+#: ../templates/config/conftypes.php:179 ../lib/modules/imapAccess.inc:477
 msgid "Server profile"
 msgstr "Server profile"
 
-#: ../templates/config/confmain.php:297
-#: ../templates/selfService/adminMain.php:481
+#: ../templates/config/confmain.php:300
+#: ../templates/selfService/adminMain.php:497
 msgid "Server settings"
 msgstr "Server settings"
 
-#: ../templates/serverInfo.php:180
+#: ../templates/serverInfo.php:181
 msgid "Server statistics"
 msgstr "Server statistics"
 
-#: ../templates/serverInfo.php:205 ../templates/serverInfo.php:211
+#: ../templates/serverInfo.php:206 ../templates/serverInfo.php:212
 msgid "Server time"
 msgstr "Server time"
 
@@ -12724,7 +12787,7 @@ msgstr "Servers"
 msgid "Service name (e.g. sshd, imap, ftp). Enter one service per entry."
 msgstr "Service name (e.g. sshd, imap, ftp). Enter one service per entry."
 
-#: ../lib/modules/bindDLZ.inc:1347
+#: ../lib/modules/bindDLZ.inc:1350
 msgid "Services (\"SRV\" records)"
 msgstr "Services (\"SRV\" records)"
 
@@ -12760,11 +12823,11 @@ msgstr "Set also for Shadow"
 msgid "Set also for Windows"
 msgstr "Set also for Windows"
 
-#: ../lib/modules.inc:1251 ../lib/modules.inc:1253
+#: ../lib/modules.inc:1259 ../lib/modules.inc:1261
 msgid "Set password"
 msgstr "Set password"
 
-#: ../lib/modules/posixAccount.inc:386 ../lib/modules/posixAccount.inc:1989
+#: ../lib/modules/posixAccount.inc:386 ../lib/modules/posixAccount.inc:1987
 msgid "Set primary group as memberUid"
 msgstr "Set primary group as memberUid"
 
@@ -12774,11 +12837,11 @@ msgstr "Set primary group as memberUid"
 msgid "Set profile password"
 msgstr "Set profile password"
 
-#: ../lib/modules.inc:1254
+#: ../lib/modules.inc:1262
 msgid "Set random password"
 msgstr "Set random password"
 
-#: ../templates/lists/changePassword.php:362
+#: ../templates/lists/changePassword.php:363
 msgid "Set specific password"
 msgstr "Set specific password"
 
@@ -12786,11 +12849,11 @@ msgstr "Set specific password"
 msgid "Set the search results to 0 to retrieve all available records."
 msgstr "Set the search results to 0 to retrieve all available records."
 
-#: ../templates/selfService/adminMain.php:583
+#: ../templates/selfService/adminMain.php:636
 msgid "Set this field read-only."
 msgstr "Set this field read-only."
 
-#: ../lib/modules/groupOfNames.inc:110
+#: ../lib/modules/groupOfNames.inc:113
 msgid ""
 "Set this only if your LDAP schema allows that groups may not have any "
 "members (e.g. if you use OpenDJ)."
@@ -12808,7 +12871,7 @@ msgstr "Sets the alias names linked to the current user name."
 msgid "Sets the alias names linked to the user's email address."
 msgstr "Sets the alias names linked to the user's email address."
 
-#: ../lib/modules/bindDLZ.inc:224
+#: ../lib/modules/bindDLZ.inc:227
 msgid ""
 "Sets the default timeout (in seconds) for entries without explicit timeout "
 "value."
@@ -12824,7 +12887,7 @@ msgstr "Sets the delivery mode (e.g. disable mail forwarding)."
 msgid "Sets the group password."
 msgstr "Sets the group password."
 
-#: ../lib/modules/bindDLZ.inc:204 ../lib/modules/bindDLZ.inc:208
+#: ../lib/modules/bindDLZ.inc:207 ../lib/modules/bindDLZ.inc:211
 msgid ""
 "Sets the preference for the mail server. Lower values have higher priority."
 msgstr ""
@@ -12834,15 +12897,15 @@ msgstr ""
 msgid "Sets this account type to read-only."
 msgstr "Sets this account type to read-only."
 
-#: ../lib/modules/shadowAccount.inc:91 ../lib/modules/shadowAccount.inc:800
-#: ../lib/modules/shadowAccount.inc:903
+#: ../lib/modules/shadowAccount.inc:91 ../lib/modules/shadowAccount.inc:798
+#: ../lib/modules/shadowAccount.inc:901
 msgid "Shadow"
 msgstr "Shadow"
 
 #: ../lib/modules/sambaSamAccount.inc:243
 #: ../lib/modules/sambaSamAccount.inc:382
 #: ../lib/modules/sambaSamAccount.inc:1490
-#: ../lib/modules/sambaSamAccount.inc:1969
+#: ../lib/modules/sambaSamAccount.inc:1967
 msgid "Shadowing"
 msgstr "Shadowing"
 
@@ -12855,9 +12918,9 @@ msgstr "Shared folder count: %s"
 msgid "Shared mail folder"
 msgstr "Shared mail folder"
 
-#: ../lib/modules/zarafaUser.inc:126 ../lib/modules/zarafaUser.inc:293
-#: ../lib/modules/zarafaUser.inc:377 ../lib/modules/zarafaUser.inc:614
-#: ../lib/modules/zarafaUser.inc:1306 ../lib/modules/zarafaUser.inc:1834
+#: ../lib/modules/zarafaUser.inc:129 ../lib/modules/zarafaUser.inc:296
+#: ../lib/modules/zarafaUser.inc:380 ../lib/modules/zarafaUser.inc:617
+#: ../lib/modules/zarafaUser.inc:1307 ../lib/modules/zarafaUser.inc:1835
 msgid "Shared store only"
 msgstr "Shared store only"
 
@@ -12873,7 +12936,7 @@ msgstr "Should fix IP addresses be added to the DNS server?"
 msgid "Show"
 msgstr "Show"
 
-#: ../templates/massBuildAccounts.php:242
+#: ../templates/upload/massBuildAccounts.php:252
 msgid "Show LDIF file"
 msgstr "Show LDIF file"
 
@@ -12886,12 +12949,12 @@ msgstr "Show account status"
 msgid "Show attributes"
 msgstr "Show attributes"
 
-#: ../lib/modules/customFields.inc:108 ../lib/modules/customFields.inc:1929
+#: ../lib/modules/customFields.inc:108 ../lib/modules/customFields.inc:1927
 msgid "Show calendar"
 msgstr "Show calendar"
 
-#: ../lib/modules/organizationalRole.inc:198
-#: ../lib/modules/windowsGroup.inc:393 ../lib/modules/groupOfNames.inc:254
+#: ../lib/modules/organizationalRole.inc:201
+#: ../lib/modules/windowsGroup.inc:396 ../lib/modules/groupOfNames.inc:257
 msgid "Show effective members"
 msgstr "Show effective members"
 
@@ -12899,7 +12962,7 @@ msgstr "Show effective members"
 msgid "Show internal attributes"
 msgstr "Show internal attributes"
 
-#: ../lib/modules/asteriskExtension.inc:453
+#: ../lib/modules/asteriskExtension.inc:455
 msgid "Show only Asterisk accounts"
 msgstr "Show only Asterisk accounts"
 
@@ -12911,11 +12974,11 @@ msgstr "Show primary group members as normal group members"
 msgid "Single Machine Licence"
 msgstr "Single Machine License"
 
-#: ../templates/schema/schema.php:194
+#: ../templates/schema/schema.php:195
 msgid "Single valued"
 msgstr "Single valued"
 
-#: ../lib/modules/pykotaUser.inc:652 ../lib/modules/pykotaUser.inc:996
+#: ../lib/modules/pykotaUser.inc:655 ../lib/modules/pykotaUser.inc:997
 msgid "Size"
 msgstr "Size"
 
@@ -12928,29 +12991,29 @@ msgstr "Size limit in bytes for a single mail. Larger mails will be bounced."
 msgid "Skip"
 msgstr "Skip"
 
-#: ../lib/modules/quota.inc:634 ../lib/modules/systemQuotas.inc:387
+#: ../lib/modules/quota.inc:635 ../lib/modules/systemQuotas.inc:388
 msgid "Soft block"
 msgstr "Soft block"
 
-#: ../lib/modules/quota.inc:113 ../lib/modules/quota.inc:401
-#: ../lib/modules/quota.inc:507 ../lib/modules/systemQuotas.inc:124
+#: ../lib/modules/quota.inc:116 ../lib/modules/quota.inc:404
+#: ../lib/modules/quota.inc:510 ../lib/modules/systemQuotas.inc:127
 msgid "Soft block limit"
 msgstr "Soft block limit"
 
-#: ../lib/modules/quota.inc:114
+#: ../lib/modules/quota.inc:117
 msgid "Soft block limit."
 msgstr "Soft block limit."
 
-#: ../lib/modules/quota.inc:636 ../lib/modules/systemQuotas.inc:389
+#: ../lib/modules/quota.inc:637 ../lib/modules/systemQuotas.inc:390
 msgid "Soft inode"
 msgstr "Soft inode"
 
-#: ../lib/modules/quota.inc:136
+#: ../lib/modules/quota.inc:139
 msgid "Soft inode (files) limit."
 msgstr "Soft inode (files) limit."
 
-#: ../lib/modules/quota.inc:135 ../lib/modules/quota.inc:405
-#: ../lib/modules/quota.inc:509 ../lib/modules/systemQuotas.inc:128
+#: ../lib/modules/quota.inc:138 ../lib/modules/quota.inc:408
+#: ../lib/modules/quota.inc:512 ../lib/modules/systemQuotas.inc:131
 msgid "Soft inode limit"
 msgstr "Soft inode limit"
 
@@ -12967,7 +13030,7 @@ msgstr ""
 msgid "Some attributes (%s) were modified and are highlighted below."
 msgstr "Some attributes (%s) were modified and are highlighted below."
 
-#: ../lib/modules.inc:894
+#: ../lib/modules.inc:902
 msgid "Some required information is missing"
 msgstr "Some required information is missing"
 
@@ -12997,15 +13060,15 @@ msgid ""
 msgstr ""
 "Specifies a filter that matches the members (e.g. \"(mail=*@zarafa.nl)\")."
 
-#: ../lib/modules/zarafaGroup.inc:122 ../lib/modules/zarafaUser.inc:190
+#: ../lib/modules/zarafaGroup.inc:122 ../lib/modules/zarafaUser.inc:193
 msgid "Specifies how \"Send as\" privileges are displayed."
 msgstr "Specifies how \"Send as\" privileges are displayed."
 
-#: ../lib/modules/groupOfNames.inc:119
+#: ../lib/modules/groupOfNames.inc:122
 msgid "Specifies how members and owners are displayed."
 msgstr "Specifies how members and owners are displayed."
 
-#: ../lib/modules/organizationalRole.inc:107
+#: ../lib/modules/organizationalRole.inc:110
 msgid "Specifies how members are displayed."
 msgstr "Specifies how members are displayed."
 
@@ -13017,7 +13080,7 @@ msgstr ""
 "Specifies if LAM should automatically follow referrals. Activate if you use "
 "referrals in your LDAP directory."
 
-#: ../help/help.inc:298
+#: ../help/help.inc:310
 msgid ""
 "Specifies if password mails may be sent to mail addresses other than the "
 "user's LDAP mail address."
@@ -13025,7 +13088,7 @@ msgstr ""
 "Specifies if password mails may be sent to mail addresses other than the "
 "user's LDAP mail address."
 
-#: ../help/help.inc:294
+#: ../help/help.inc:306
 msgid "Specifies if the mail should be sent as text or HTML."
 msgstr "Specifies if the mail should be sent as text or HTML."
 
@@ -13083,7 +13146,7 @@ msgid "Specifies the allowed file extension. This is checked at upload time."
 msgstr "Specifies the allowed file extension. This is checked at upload time."
 
 #: ../lib/modules/zarafaContact.inc:102 ../lib/modules/zarafaGroup.inc:103
-#: ../lib/modules/zarafaUser.inc:159
+#: ../lib/modules/zarafaUser.inc:162
 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\"."
@@ -13091,7 +13154,7 @@ msgstr ""
 "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\"."
 
-#: ../lib/modules/zarafaUser.inc:135
+#: ../lib/modules/zarafaUser.inc:138
 msgid "Specifies the capacity of this resource."
 msgstr "Specifies the capacity of this resource."
 
@@ -13199,13 +13262,13 @@ msgstr ""
 "Specifies the person's relationships to the institution in broad categories "
 "such as student, faculty, staff, alum, etc."
 
-#: ../lib/modules/bindDLZ.inc:180 ../lib/modules/bindDLZ.inc:184
+#: ../lib/modules/bindDLZ.inc:183 ../lib/modules/bindDLZ.inc:187
 msgid ""
 "Specifies the priority of this entry (lower value means more preferred)."
 msgstr ""
 "Specifies the priority of this entry (lower value means more preferred)."
 
-#: ../lib/modules/pykotaGroup.inc:126 ../lib/modules/pykotaUser.inc:129
+#: ../lib/modules/pykotaGroup.inc:126 ../lib/modules/pykotaUser.inc:132
 msgid ""
 "Specifies the type of limit for printing if any. Please note that in "
 "contrast to \"Free printing\" the option \"No quota\" includes accounting."
@@ -13213,7 +13276,7 @@ msgstr ""
 "Specifies the type of limit for printing if any. Please note that in "
 "contrast to \"Free printing\" the option \"No quota\" includes accounting."
 
-#: ../lib/modules/bindDLZ.inc:196 ../lib/modules/bindDLZ.inc:200
+#: ../lib/modules/bindDLZ.inc:199 ../lib/modules/bindDLZ.inc:203
 msgid "Specifies the used port for this entry."
 msgstr "Specifies the used port for this entry."
 
@@ -13221,11 +13284,11 @@ msgstr "Specifies the used port for this entry."
 msgid "Specifies the user's pickup group."
 msgstr "Specifies the user's pickup group."
 
-#: ../lib/modules/bindDLZ.inc:188 ../lib/modules/bindDLZ.inc:192
+#: ../lib/modules/bindDLZ.inc:191 ../lib/modules/bindDLZ.inc:195
 msgid "Specifies the weight of this entry (relative value)."
 msgstr "Specifies the weight of this entry (relative value)."
 
-#: ../lib/modules/zarafaUser.inc:123
+#: ../lib/modules/zarafaUser.inc:126
 msgid ""
 "Specifies whether the user is an admin. System administrators may "
 "additionally create, modify and delete companies."
@@ -13251,24 +13314,24 @@ msgstr "Specify attributes and values"
 msgid "Standard LDAP search filter. Example: (&(sn=Smith)(givenName=David))"
 msgstr "Standard LDAP search filter. Example: (&(sn=Smith)(givenName=David))"
 
-#: ../templates/serverInfo.php:193 ../templates/serverInfo.php:199
+#: ../templates/serverInfo.php:194 ../templates/serverInfo.php:200
 msgid "Start time"
 msgstr "Start time"
 
 #: ../lib/modules/windowsUser.inc:182 ../lib/modules/windowsUser.inc:472
 #: ../lib/modules/windowsUser.inc:829 ../lib/modules/windowsUser.inc:920
-#: ../lib/modules/windowsUser.inc:1097 ../lib/modules/windowsUser.inc:2440
-#: ../lib/modules/windowsUser.inc:2619 ../lib/modules/inetOrgPerson.inc:164
-#: ../lib/modules/inetOrgPerson.inc:196 ../lib/modules/inetOrgPerson.inc:532
-#: ../lib/modules/inetOrgPerson.inc:574 ../lib/modules/inetOrgPerson.inc:807
-#: ../lib/modules/inetOrgPerson.inc:811 ../lib/modules/inetOrgPerson.inc:1342
-#: ../lib/modules/inetOrgPerson.inc:1345 ../lib/modules/inetOrgPerson.inc:2003
-#: ../lib/modules/inetOrgPerson.inc:2679 ../lib/modules/inetOrgPerson.inc:3652
-#: ../lib/modules/inetOrgPerson.inc:3717
+#: ../lib/modules/windowsUser.inc:1097 ../lib/modules/windowsUser.inc:2438
+#: ../lib/modules/windowsUser.inc:2617 ../lib/modules/inetOrgPerson.inc:162
+#: ../lib/modules/inetOrgPerson.inc:194 ../lib/modules/inetOrgPerson.inc:530
+#: ../lib/modules/inetOrgPerson.inc:572 ../lib/modules/inetOrgPerson.inc:805
+#: ../lib/modules/inetOrgPerson.inc:809 ../lib/modules/inetOrgPerson.inc:1340
+#: ../lib/modules/inetOrgPerson.inc:1343 ../lib/modules/inetOrgPerson.inc:1999
+#: ../lib/modules/inetOrgPerson.inc:2675 ../lib/modules/inetOrgPerson.inc:3632
+#: ../lib/modules/inetOrgPerson.inc:3697
 msgid "State"
 msgstr "State"
 
-#: ../templates/pdfedit/pdfpage.php:542 ../templates/pdfedit/pdfpage.php:544
+#: ../templates/pdfedit/pdfpage.php:557 ../templates/pdfedit/pdfpage.php:559
 msgid "Static text"
 msgstr "Static text"
 
@@ -13278,13 +13341,13 @@ msgstr "Static text"
 msgid "Step %s of %s"
 msgstr "Step %s of %s"
 
-#: ../lib/modules/windowsUser.inc:414 ../lib/modules/inetOrgPerson.inc:317
+#: ../lib/modules/windowsUser.inc:414 ../lib/modules/inetOrgPerson.inc:315
 msgid "Steve"
 msgstr "Steve"
 
 #: ../lib/modules/sambaSamAccount.inc:428 ../lib/modules/posixAccount.inc:291
 #: ../lib/modules/windowsUser.inc:426 ../lib/modules/windowsUser.inc:432
-#: ../lib/modules/pykotaUser.inc:201 ../lib/modules/inetOrgPerson.inc:2136
+#: ../lib/modules/pykotaUser.inc:204 ../lib/modules/inetOrgPerson.inc:2132
 #: ../lib/modules/asteriskVoicemail.inc:174
 msgid "Steve Miller"
 msgstr "Steve Miller"
@@ -13308,18 +13371,18 @@ msgstr ""
 #: ../lib/types/user.inc:111 ../lib/modules/windowsUser.inc:186
 #: ../lib/modules/windowsUser.inc:448 ../lib/modules/windowsUser.inc:830
 #: ../lib/modules/windowsUser.inc:919 ../lib/modules/windowsUser.inc:1093
-#: ../lib/modules/windowsUser.inc:2441 ../lib/modules/windowsUser.inc:2618
-#: ../lib/modules/inetOrgPerson.inc:83 ../lib/modules/inetOrgPerson.inc:161
-#: ../lib/modules/inetOrgPerson.inc:184 ../lib/modules/inetOrgPerson.inc:386
-#: ../lib/modules/inetOrgPerson.inc:562 ../lib/modules/inetOrgPerson.inc:684
-#: ../lib/modules/inetOrgPerson.inc:688 ../lib/modules/inetOrgPerson.inc:1306
-#: ../lib/modules/inetOrgPerson.inc:1309 ../lib/modules/inetOrgPerson.inc:1987
-#: ../lib/modules/inetOrgPerson.inc:2602 ../lib/modules/inetOrgPerson.inc:3644
-#: ../lib/modules/inetOrgPerson.inc:3714
+#: ../lib/modules/windowsUser.inc:2439 ../lib/modules/windowsUser.inc:2616
+#: ../lib/modules/inetOrgPerson.inc:81 ../lib/modules/inetOrgPerson.inc:159
+#: ../lib/modules/inetOrgPerson.inc:182 ../lib/modules/inetOrgPerson.inc:384
+#: ../lib/modules/inetOrgPerson.inc:560 ../lib/modules/inetOrgPerson.inc:682
+#: ../lib/modules/inetOrgPerson.inc:686 ../lib/modules/inetOrgPerson.inc:1304
+#: ../lib/modules/inetOrgPerson.inc:1307 ../lib/modules/inetOrgPerson.inc:1983
+#: ../lib/modules/inetOrgPerson.inc:2598 ../lib/modules/inetOrgPerson.inc:3624
+#: ../lib/modules/inetOrgPerson.inc:3694
 msgid "Street"
 msgstr "Street"
 
-#: ../templates/pdfedit/pdfpage.php:453 ../templates/pdfedit/pdfmain.php:360
+#: ../templates/pdfedit/pdfpage.php:468 ../templates/pdfedit/pdfmain.php:410
 msgid "Structure name"
 msgstr "Structure name"
 
@@ -13328,37 +13391,42 @@ msgstr "Structure name"
 msgid "Sub (entire subtree)"
 msgstr "Sub (entire subtree)"
 
-#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:91
-#: ../lib/modules/nisnetgroup.inc:126 ../lib/modules/nisnetgroup.inc:141
-#: ../lib/modules/nisnetgroup.inc:209 ../lib/modules/nisnetgroup.inc:383
-#: ../lib/modules/nisnetgroup.inc:581
+#: ../lib/types/netgroup.inc:93 ../lib/modules/nisnetgroup.inc:94
+#: ../lib/modules/nisnetgroup.inc:129 ../lib/modules/nisnetgroup.inc:144
+#: ../lib/modules/nisnetgroup.inc:212 ../lib/modules/nisnetgroup.inc:386
+#: ../lib/modules/nisnetgroup.inc:582
 msgid "Subgroups"
 msgstr "Subgroups"
 
-#: ../templates/config/confmain.php:426 ../lib/passwordExpirationJob.inc:85
+#: ../templates/config/confmain.php:429 ../lib/passwordExpirationJob.inc:85
 #: ../lib/modules/selfRegistration.inc:94
 #: ../lib/modules/selfRegistration.inc:237
 #: ../lib/modules/passwordSelfReset.inc:124
-#: ../lib/modules/passwordSelfReset.inc:681
-#: ../lib/modules/passwordSelfReset.inc:701 ../help/help.inc:286
-#: ../help/help.inc:324
+#: ../lib/modules/passwordSelfReset.inc:679
+#: ../lib/modules/passwordSelfReset.inc:699 ../help/help.inc:298
+#: ../help/help.inc:336
 msgid "Subject"
 msgstr "Subject"
 
+#: ../templates/selfService/selfService2Factor.php:203
+#: ../templates/login2Factor.php:216
+msgid "Submit"
+msgstr "Submit"
+
 #: ../lib/types/dhcp.inc:94 ../lib/modules/dhcp_settings.inc:154
 #: ../lib/modules/dhcp_settings.inc:212 ../lib/modules/dhcp_settings.inc:227
 #: ../lib/modules/dhcp_settings.inc:247 ../lib/modules/dhcp_settings.inc:563
-#: ../lib/modules/dhcp_settings.inc:687
+#: ../lib/modules/dhcp_settings.inc:685
 msgid "Subnet"
 msgstr "Subnet"
 
 #: ../lib/modules/dhcp_settings.inc:194 ../lib/modules/dhcp_settings.inc:220
 #: ../lib/modules/dhcp_settings.inc:238 ../lib/modules/dhcp_settings.inc:305
-#: ../lib/modules/dhcp_settings.inc:608 ../lib/modules/dhcp_settings.inc:684
+#: ../lib/modules/dhcp_settings.inc:608 ../lib/modules/dhcp_settings.inc:682
 msgid "Subnet mask"
 msgstr "Subnet mask"
 
-#: ../templates/schema/schema.php:176
+#: ../templates/schema/schema.php:177
 msgid "Substring Rule"
 msgstr "Substring Rule"
 
@@ -13396,7 +13464,7 @@ msgid "Sudo roles with higher order numbers are used if multiple roles match."
 msgstr "Sudo roles with higher order numbers are used if multiple roles match."
 
 #: ../lib/modules/nisMailAliasUser.inc:92
-#: ../lib/modules/nisMailAliasUser.inc:362 ../lib/modules.inc:1006
+#: ../lib/modules/nisMailAliasUser.inc:368 ../lib/modules.inc:1014
 msgid "Suffix"
 msgstr "Suffix"
 
@@ -13404,8 +13472,8 @@ msgstr "Suffix"
 msgid "Suffix for GID/group name check"
 msgstr "Suffix for GID/group name check"
 
-#: ../lib/modules/posixAccount.inc:431 ../lib/modules/posixAccount.inc:1923
-#: ../lib/modules/posixAccount.inc:1960
+#: ../lib/modules/posixAccount.inc:431 ../lib/modules/posixAccount.inc:1921
+#: ../lib/modules/posixAccount.inc:1958
 msgid "Suffix for UID/user name check"
 msgstr "Suffix for UID/user name check"
 
@@ -13418,7 +13486,7 @@ msgstr "Suffix for new users"
 msgid "Sunday"
 msgstr "Sunday"
 
-#: ../templates/selfService/adminMain.php:592
+#: ../templates/selfService/adminMain.php:645
 msgid "Switch back to default label."
 msgstr "Switch back to default label."
 
@@ -13440,7 +13508,7 @@ msgid "Sync MIT Kerberos password with Unix password"
 msgstr "Sync MIT Kerberos password with Unix password"
 
 #: ../lib/modules/passwordSelfReset.inc:152
-#: ../lib/modules/passwordSelfReset.inc:671
+#: ../lib/modules/passwordSelfReset.inc:669
 msgid "Sync Samba 3 password"
 msgstr "Sync Samba 3 password"
 
@@ -13456,7 +13524,7 @@ msgstr "Sync Samba NT password with Unix password"
 msgid "Sync Unix password with Windows password"
 msgstr "Sync Unix password with Windows password"
 
-#: ../lib/modules/customFields.inc:1116
+#: ../lib/modules/customFields.inc:1114
 msgid "Sync fields with page layout"
 msgstr "Sync fields with page layout"
 
@@ -13465,20 +13533,20 @@ msgstr "Sync fields with page layout"
 msgid "Sync from %s"
 msgstr "Sync from %s"
 
-#: ../templates/schema/schema.php:181
+#: ../templates/schema/schema.php:182
 #: ../templates/3rdParty/pla/htdocs/add_value_form.php:142
 msgid "Syntax"
 msgstr "Syntax"
 
-#: ../templates/schema/schema.php:89
+#: ../templates/schema/schema.php:90
 msgid "Syntax OID"
 msgstr "Syntax OID"
 
-#: ../templates/schema/schema.php:73 ../templates/schema/schema.php:74
+#: ../templates/schema/schema.php:74 ../templates/schema/schema.php:75
 msgid "Syntaxes"
 msgstr "Syntaxes"
 
-#: ../lib/modules/zarafaUser.inc:632 ../lib/modules/zarafaUser.inc:1297
+#: ../lib/modules/zarafaUser.inc:635 ../lib/modules/zarafaUser.inc:1298
 msgid "System administrator"
 msgstr "System administrator"
 
@@ -13490,18 +13558,18 @@ msgstr "System logging"
 msgid "TLS cannot be combined with ldaps://."
 msgstr "TLS cannot be combined with ldaps://."
 
-#: ../lib/modules/bindDLZ.inc:125 ../lib/modules/bindDLZ.inc:377
-#: ../lib/modules/bindDLZ.inc:382 ../lib/modules/bindDLZ.inc:491
+#: ../lib/modules/bindDLZ.inc:128 ../lib/modules/bindDLZ.inc:380
+#: ../lib/modules/bindDLZ.inc:385 ../lib/modules/bindDLZ.inc:494
 msgid "TXT record"
 msgstr "TXT record"
 
-#: ../lib/modules/bindDLZ.inc:432 ../lib/modules/bindDLZ.inc:442
-#: ../lib/modules/bindDLZ.inc:1574
+#: ../lib/modules/bindDLZ.inc:435 ../lib/modules/bindDLZ.inc:445
+#: ../lib/modules/bindDLZ.inc:1575
 msgid "TXT records"
 msgstr "TXT records"
 
 #: ../lib/passwordExpirationJob.inc:482 ../lib/passwordExpirationJob.inc:516
-#: ../help/help.inc:354
+#: ../help/help.inc:366
 msgid "Target DN"
 msgstr "Target DN"
 
@@ -13510,44 +13578,44 @@ msgstr "Target DN"
 #: ../lib/modules/kolabSharedFolder.inc:240
 #: ../lib/modules/kolabSharedFolder.inc:262
 #: ../lib/modules/kolabSharedFolder.inc:292
-#: ../lib/modules/kolabSharedFolder.inc:523
+#: ../lib/modules/kolabSharedFolder.inc:521
 msgid "Target IMAP folder"
 msgstr "Target IMAP folder"
 
-#: ../lib/modules/kolabUser.inc:245
+#: ../lib/modules/kolabUser.inc:248
 msgid "Target of invitation policy is invalid!"
 msgstr "Target of invitation policy is invalid!"
 
-#: ../templates/pdfedit/pdfmain.php:323
-#: ../templates/profedit/profilemain.php:290
+#: ../templates/pdfedit/pdfmain.php:367
+#: ../templates/profedit/profilemain.php:328
 msgid "Target server profile"
 msgstr "Target server profile"
 
-#: ../templates/help.php:88 ../lib/modules.inc:669
+#: ../templates/help.php:88 ../lib/modules.inc:682
 msgid "Technical name"
 msgstr "Technical name"
 
-#: ../templates/lists/changePassword.php:293 ../lib/types/user.inc:112
+#: ../templates/lists/changePassword.php:294 ../lib/types/user.inc:112
 #: ../lib/types/user.inc:215 ../lib/modules/windowsUser.inc:190
 #: ../lib/modules/windowsUser.inc:496 ../lib/modules/windowsUser.inc:831
 #: ../lib/modules/windowsUser.inc:916 ../lib/modules/windowsUser.inc:962
-#: ../lib/modules/windowsUser.inc:1106 ../lib/modules/windowsUser.inc:2442
-#: ../lib/modules/windowsUser.inc:2612 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:160 ../lib/modules/inetOrgPerson.inc:211
-#: ../lib/modules/inetOrgPerson.inc:426 ../lib/modules/inetOrgPerson.inc:589
-#: ../lib/modules/inetOrgPerson.inc:716 ../lib/modules/inetOrgPerson.inc:720
-#: ../lib/modules/inetOrgPerson.inc:1463 ../lib/modules/inetOrgPerson.inc:1466
-#: ../lib/modules/inetOrgPerson.inc:1992 ../lib/modules/inetOrgPerson.inc:2547
-#: ../lib/modules/inetOrgPerson.inc:3662 ../lib/modules/inetOrgPerson.inc:3720
+#: ../lib/modules/windowsUser.inc:1106 ../lib/modules/windowsUser.inc:2440
+#: ../lib/modules/windowsUser.inc:2610 ../lib/modules/inetOrgPerson.inc:68
+#: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:209
+#: ../lib/modules/inetOrgPerson.inc:424 ../lib/modules/inetOrgPerson.inc:587
+#: ../lib/modules/inetOrgPerson.inc:714 ../lib/modules/inetOrgPerson.inc:718
+#: ../lib/modules/inetOrgPerson.inc:1461 ../lib/modules/inetOrgPerson.inc:1464
+#: ../lib/modules/inetOrgPerson.inc:1988 ../lib/modules/inetOrgPerson.inc:2543
+#: ../lib/modules/inetOrgPerson.inc:3642 ../lib/modules/inetOrgPerson.inc:3700
 msgid "Telephone number"
 msgstr "Telephone number"
 
-#: ../lib/modules/windowsUser.inc:696 ../lib/modules/inetOrgPerson.inc:364
+#: ../lib/modules/windowsUser.inc:696 ../lib/modules/inetOrgPerson.inc:362
 msgid "Temp"
 msgstr "Temp"
 
-#: ../lib/modules/windowsUser.inc:444 ../lib/modules/pykotaUser.inc:228
-#: ../lib/modules/inetOrgPerson.inc:340
+#: ../lib/modules/windowsUser.inc:444 ../lib/modules/pykotaUser.inc:231
+#: ../lib/modules/inetOrgPerson.inc:338
 msgid "Temp, contract till December"
 msgstr "Temp, contract till December"
 
@@ -13570,32 +13638,32 @@ msgstr "Terminal server options"
 msgid "Test settings"
 msgstr "Test settings"
 
-#: ../lib/tools/tests.inc:44
+#: ../lib/tools/tests.inc:45
 msgid "Tests"
 msgstr "Tests"
 
-#: ../templates/config/confmain.php:441 ../lib/passwordExpirationJob.inc:87
+#: ../templates/config/confmain.php:444 ../lib/passwordExpirationJob.inc:87
 #: ../lib/modules/selfRegistration.inc:69
-#: ../lib/modules/selfRegistration.inc:244 ../lib/modules/bindDLZ.inc:163
-#: ../lib/modules/bindDLZ.inc:167 ../lib/modules/bindDLZ.inc:377
-#: ../lib/modules/bindDLZ.inc:1245 ../lib/modules/bindDLZ.inc:1576
+#: ../lib/modules/selfRegistration.inc:244 ../lib/modules/bindDLZ.inc:166
+#: ../lib/modules/bindDLZ.inc:170 ../lib/modules/bindDLZ.inc:380
+#: ../lib/modules/bindDLZ.inc:1248 ../lib/modules/bindDLZ.inc:1577
 #: ../lib/modules/passwordSelfReset.inc:128
 #: ../lib/modules/passwordSelfReset.inc:138
-#: ../lib/modules/passwordSelfReset.inc:685
-#: ../lib/modules/passwordSelfReset.inc:705 ../help/help.inc:288
-#: ../help/help.inc:328
+#: ../lib/modules/passwordSelfReset.inc:683
+#: ../lib/modules/passwordSelfReset.inc:703 ../help/help.inc:300
+#: ../help/help.inc:340
 msgid "Text"
 msgstr "Text"
 
-#: ../lib/modules/bindDLZ.inc:1242
+#: ../lib/modules/bindDLZ.inc:1245
 msgid "Text (\"TXT\" records)"
 msgstr "Text (\"TXT\" records)"
 
-#: ../lib/modules/customFields.inc:2725
+#: ../lib/modules/customFields.inc:2723
 msgid "Text area"
 msgstr "Text area"
 
-#: ../templates/pdfedit/pdfpage.php:621 ../lib/modules/customFields.inc:1914
+#: ../templates/pdfedit/pdfpage.php:637 ../lib/modules/customFields.inc:1912
 msgid "Text field"
 msgstr "Text field"
 
@@ -13650,31 +13718,31 @@ msgid "The IMAP admin password is empty."
 msgstr "The IMAP admin password is empty."
 
 #: ../templates/config/mainmanage.php:108
-#: ../templates/config/mainmanage.php:130 ../lib/modules/bindDLZ.inc:495
-#: ../lib/modules/bindDLZ.inc:496
+#: ../templates/config/mainmanage.php:130 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/bindDLZ.inc:499
 #, php-format
 msgid "The IP address %s is invalid!"
 msgstr "The IP address %s is invalid!"
 
-#: ../lib/modules/fixed_ip.inc:498
+#: ../lib/modules/fixed_ip.inc:501
 msgid "The IP address does not match the subnet."
 msgstr "The IP address does not match the subnet."
 
-#: ../lib/modules/fixed_ip.inc:501
+#: ../lib/modules/fixed_ip.inc:504
 msgid "The IP address is already in use."
 msgstr "The IP address is already in use."
 
 #: ../lib/modules/ipHost.inc:123 ../lib/modules/ipHost.inc:124
 #: ../lib/modules/asteriskAccount.inc:574
 #: ../lib/modules/asteriskAccount.inc:575 ../lib/modules/ppolicyUser.inc:101
-#: ../lib/modules/range.inc:505 ../lib/modules/range.inc:522
-#: ../lib/modules/range.inc:582 ../lib/modules/range.inc:599
+#: ../lib/modules/range.inc:508 ../lib/modules/range.inc:525
+#: ../lib/modules/range.inc:585 ../lib/modules/range.inc:602
 #: ../lib/modules/freeRadius.inc:329 ../lib/modules/freeRadius.inc:330
-#: ../lib/modules/fixed_ip.inc:493
+#: ../lib/modules/fixed_ip.inc:496
 msgid "The IP address is invalid."
 msgstr "The IP address is invalid."
 
-#: ../lib/modules/fixed_ip.inc:107
+#: ../lib/modules/fixed_ip.inc:110
 msgid "The IP address of the PC."
 msgstr "The IP address of the PC."
 
@@ -13694,8 +13762,8 @@ msgstr ""
 "The IP addresses of the Netbios name servers (e.g. \"123.123.123.123, "
 "123.123.123.124\")."
 
-#: ../lib/modules/range.inc:509 ../lib/modules/range.inc:524
-#: ../lib/modules/range.inc:588 ../lib/modules/range.inc:602
+#: ../lib/modules/range.inc:512 ../lib/modules/range.inc:527
+#: ../lib/modules/range.inc:591 ../lib/modules/range.inc:605
 msgid "The IP does not match the subnet."
 msgstr "The IP does not match the subnet."
 
@@ -13707,7 +13775,7 @@ msgstr "The Kerberos realm for this account."
 msgid "The Kerberos realm of this user."
 msgstr "The Kerberos realm of this user."
 
-#: ../lib/modules/fixed_ip.inc:103
+#: ../lib/modules/fixed_ip.inc:106
 msgid "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgstr "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 
@@ -13715,15 +13783,15 @@ msgstr "The MAC address of the PC. Example: 11:22:33:44:55:aa"
 msgid "The Netbios server is invalid."
 msgstr "The Netbios server is invalid."
 
-#: ../lib/modules/fixed_ip.inc:456
+#: ../lib/modules/fixed_ip.inc:459
 msgid "The PC name may not be longer than 20 characters."
 msgstr "The PC name may not be longer than 20 characters."
 
-#: ../lib/modules/fixed_ip.inc:465
+#: ../lib/modules/fixed_ip.inc:468
 msgid "The PC name may only contain A-Z, a-z and 0-9."
 msgstr "The PC name may only contain A-Z, a-z and 0-9."
 
-#: ../lib/modules/fixed_ip.inc:459
+#: ../lib/modules/fixed_ip.inc:462
 msgid "The PC name needs to be at least 2 characters long."
 msgstr "The PC name needs to be at least 2 characters long."
 
@@ -13751,8 +13819,8 @@ msgstr "The Radius realm of this account."
 msgid "The SID of your Samba server. Get it with \"net getlocalsid\"."
 msgstr "The SID of your Samba server. Get it with \"net getlocalsid\"."
 
-#: ../templates/selfService/selfServiceLogin.php:149
-#: ../templates/selfService/selfServiceMain.php:179
+#: ../templates/selfService/selfServiceLogin.php:158
+#: ../templates/selfService/selfServiceMain.php:188
 msgid "The TLS encryption could not be started."
 msgstr "The TLS encryption could not be started."
 
@@ -13776,7 +13844,7 @@ msgid "The account context is invalid."
 msgstr "The account context is invalid."
 
 #: ../lib/modules/asteriskAccount.inc:112
-#: ../lib/modules/asteriskExtension.inc:99
+#: ../lib/modules/asteriskExtension.inc:101
 #: ../lib/modules/asteriskVoicemail.inc:92
 msgid "The account context stores information about the dial plan."
 msgstr "The account context stores information about the dial plan."
@@ -13794,12 +13862,12 @@ msgstr "The account will be locked after this date."
 msgid "The account will be saved under this LDAP suffix."
 msgstr "The account will be saved under this LDAP suffix."
 
-#: ../lib/modules/bindDLZ.inc:497 ../lib/modules/bindDLZ.inc:498
+#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:501
 #, php-format
 msgid "The alias name \"%s\" is invalid."
 msgstr "The alias name \"%s\" is invalid."
 
-#: ../lib/modules/bindDLZ.inc:136
+#: ../lib/modules/bindDLZ.inc:139
 msgid "The alias name for this entry."
 msgstr "The alias name for this entry."
 
@@ -13808,11 +13876,11 @@ msgstr "The alias name for this entry."
 msgid "The answer needs to be at least %s characters long."
 msgstr "The answer needs to be at least %s characters long."
 
-#: ../lib/modules/passwordSelfReset.inc:1454
+#: ../lib/modules/passwordSelfReset.inc:1452
 msgid "The answer to the security question is wrong."
 msgstr "The answer to the security question is wrong."
 
-#: ../templates/tests/schemaTest.php:128
+#: ../templates/tests/schemaTest.php:131
 #, php-format
 msgid ""
 "The attribute %s is not supported for the object class %s by your LDAP "
@@ -13839,16 +13907,16 @@ msgstr "The caller ID format is invalid."
 msgid "The captcha was wrong."
 msgstr "The captcha was wrong."
 
-#: ../lib/modules/puppetClient.inc:198
+#: ../lib/modules/puppetClient.inc:201
 msgid "The class names contain invalid values."
 msgstr "The class names contain invalid values."
 
-#: ../lib/modules/puppetClient.inc:196 ../lib/modules/puppetClient.inc:197
+#: ../lib/modules/puppetClient.inc:199 ../lib/modules/puppetClient.inc:200
 msgid "The class names may only contain ASCII characters."
 msgstr "The class names may only contain ASCII characters."
 
-#: ../templates/config/confmain.php:181
-#: ../templates/selfService/adminMain.php:376
+#: ../templates/config/confmain.php:184
+#: ../templates/selfService/adminMain.php:392
 msgid "The config file is not writable."
 msgstr "The config file is not writable."
 
@@ -13889,7 +13957,7 @@ msgstr "The domain name of the subnet."
 msgid "The email address is invalid."
 msgstr "The email address is invalid."
 
-#: ../lib/modules/range.inc:102
+#: ../lib/modules/range.inc:105
 msgid "The ending IP address of the range."
 msgstr "The ending IP address of the range."
 
@@ -13916,11 +13984,11 @@ msgstr "The entry (%s) does not exist."
 msgid "The entry does not exist and will be ignored"
 msgstr "The entry does not exist and will be ignored"
 
-#: ../lib/modules/puppetClient.inc:194 ../lib/modules/puppetClient.inc:195
+#: ../lib/modules/puppetClient.inc:197 ../lib/modules/puppetClient.inc:198
 msgid "The environment name may only contain ASCII characters."
 msgstr "The environment name may only contain ASCII characters."
 
-#: ../help/help.inc:331
+#: ../help/help.inc:343
 msgid ""
 "The expiration date can be added with @@EXPIRE_DATE_DDMMYYYY@@ or "
 "@@EXPIRE_DATE_YYYYMMDD@@."
@@ -13936,12 +14004,12 @@ msgstr "The expiration date is invalid."
 msgid "The expiration date must be in format DD.MM.YYYY HH:MM."
 msgstr "The expiration date must be in format DD.MM.YYYY HH:MM."
 
-#: ../lib/modules/bindDLZ.inc:519 ../lib/modules/bindDLZ.inc:520
+#: ../lib/modules/bindDLZ.inc:522 ../lib/modules/bindDLZ.inc:523
 #, php-format
 msgid "The expiration time \"%s\" must be a number."
 msgstr "The expiration time \"%s\" must be a number."
 
-#: ../help/help.inc:355
+#: ../help/help.inc:367
 msgid "The expired accounts will be moved to this DN."
 msgstr "The expired accounts will be moved to this DN."
 
@@ -13950,11 +14018,11 @@ msgstr "The expired accounts will be moved to this DN."
 msgid "The extension context is invalid."
 msgstr "The extension context is invalid."
 
-#: ../lib/pdfstruct.inc:262
+#: ../lib/pdfstruct.inc:273
 msgid "The file must not exeed 2000x300px."
 msgstr "The file must not exeed 2000x300px."
 
-#: ../lib/pdfstruct.inc:249
+#: ../lib/pdfstruct.inc:260
 msgid "The file name must end with \".png\" or \".jpg\"."
 msgstr "The file name must end with \".png\" or \".jpg\"."
 
@@ -13998,7 +14066,7 @@ msgstr ""
 msgid "The folder's email address."
 msgstr "The folder's email address."
 
-#: ../templates/initsuff.php:184
+#: ../templates/initsuff.php:185
 msgid ""
 "The following suffixes are missing in LDAP. LAM can create them for you."
 msgstr ""
@@ -14028,7 +14096,7 @@ msgstr ""
 msgid "The full name is invalid."
 msgstr "The full name is invalid."
 
-#: ../templates/login.php:602
+#: ../templates/login.php:611
 msgid "The given user name matches multiple LDAP entries."
 msgstr "The given user name matches multiple LDAP entries."
 
@@ -14040,7 +14108,7 @@ msgstr ""
 "The grace authentication limit specifies the number of times that an expired "
 "password may be used to login."
 
-#: ../lib/modules/windowsGroup.inc:153
+#: ../lib/modules/windowsGroup.inc:156
 msgid "The group is managed by this contact person."
 msgstr "The group is managed by this contact person."
 
@@ -14052,7 +14120,7 @@ msgstr "The group names for this account."
 msgid "The groups for this account. You can insert a group name or DN."
 msgstr "The groups for this account. You can insert a group name or DN."
 
-#: ../templates/pdfedit/pdfpage.php:141
+#: ../templates/pdfedit/pdfpage.php:159
 msgid "The headline for a new section must contain at least one character."
 msgstr "The headline for a new section must contain at least one character."
 
@@ -14064,24 +14132,24 @@ msgstr "The home directory will be connected under this drive letter."
 msgid "The host is managed by this contact person."
 msgstr "The host is managed by this contact person."
 
-#: ../lib/modules/bindDLZ.inc:504 ../lib/modules/bindDLZ.inc:505
-#: ../lib/modules/bindDLZ.inc:531 ../lib/modules/bindDLZ.inc:532
+#: ../lib/modules/bindDLZ.inc:507 ../lib/modules/bindDLZ.inc:508
+#: ../lib/modules/bindDLZ.inc:534 ../lib/modules/bindDLZ.inc:535
 #, php-format
 msgid "The host name \"%s\" is invalid."
 msgstr "The host name \"%s\" is invalid."
 
-#: ../lib/modules/bindDLZ.inc:89 ../lib/modules/bindDLZ.inc:148
-#: ../lib/modules/bindDLZ.inc:152
+#: ../lib/modules/bindDLZ.inc:92 ../lib/modules/bindDLZ.inc:151
+#: ../lib/modules/bindDLZ.inc:155
 msgid "The host name for this entry."
 msgstr "The host name for this entry."
 
 #: ../lib/modules/asteriskAccount.inc:563
-#: ../lib/modules/asteriskAccount.inc:564 ../lib/modules/bindDLZ.inc:477
-#: ../lib/modules/bindDLZ.inc:478
+#: ../lib/modules/asteriskAccount.inc:564 ../lib/modules/bindDLZ.inc:480
+#: ../lib/modules/bindDLZ.inc:481
 msgid "The host name is invalid."
 msgstr "The host name is invalid."
 
-#: ../lib/modules/windowsUser.inc:147 ../lib/modules/inetOrgPerson.inc:865
+#: ../lib/modules/windowsUser.inc:147 ../lib/modules/inetOrgPerson.inc:863
 msgid "The initials of the user's first names."
 msgstr "The initials of the user's first names."
 
@@ -14109,7 +14177,7 @@ msgstr ""
 msgid "The list of commands which may be run."
 msgstr "The list of commands which may be run."
 
-#: ../lib/modules/puppetClient.inc:98 ../lib/modules/puppetClient.inc:102
+#: ../lib/modules/puppetClient.inc:101 ../lib/modules/puppetClient.inc:105
 msgid "The list of configured Puppet classes for this node (e.g. ntp)."
 msgstr "The list of configured Puppet classes for this node (e.g. ntp)."
 
@@ -14117,7 +14185,7 @@ msgstr "The list of configured Puppet classes for this node (e.g. ntp)."
 msgid "The list of hosts from which the user may run the commands."
 msgstr "The list of hosts from which the user may run the commands."
 
-#: ../lib/modules/customFields.inc:3190
+#: ../lib/modules/customFields.inc:3188
 msgid "The list of labels contains duplicates."
 msgstr "The list of labels contains duplicates."
 
@@ -14125,7 +14193,7 @@ msgstr "The list of labels contains duplicates."
 msgid "The list of users who own this sudo role and may run the commands."
 msgstr "The list of users who own this sudo role and may run the commands."
 
-#: ../lib/modules/customFields.inc:3187
+#: ../lib/modules/customFields.inc:3185
 msgid "The list of values contains duplicates."
 msgstr "The list of values contains duplicates."
 
@@ -14135,7 +14203,7 @@ msgstr "The list's alternate email address."
 
 #: ../lib/modules/kolabGroup.inc:88 ../lib/modules/kolabGroup.inc:92
 #: ../lib/modules/qmailGroup.inc:124 ../lib/modules/qmailGroup.inc:128
-#: ../lib/modules/windowsGroup.inc:129
+#: ../lib/modules/windowsGroup.inc:132
 msgid "The list's email address."
 msgstr "The list's email address."
 
@@ -14157,7 +14225,7 @@ msgid ""
 msgstr ""
 "The login name of your IMAP user who has rights to create/delete mailboxes."
 
-#: ../lib/modules/bindDLZ.inc:140 ../lib/modules/bindDLZ.inc:144
+#: ../lib/modules/bindDLZ.inc:143 ../lib/modules/bindDLZ.inc:147
 msgid "The mail server for this entry."
 msgstr "The mail server for this entry."
 
@@ -14171,11 +14239,11 @@ msgid ""
 msgstr ""
 "The mail text for confirmation mails must include the wildcard @@resetLink@@."
 
-#: ../help/help.inc:329
+#: ../help/help.inc:341
 msgid "The mail text of all mails."
 msgstr "The mail text of all mails."
 
-#: ../help/help.inc:289
+#: ../help/help.inc:301
 msgid "The mail text of all password mails."
 msgstr "The mail text of all password mails."
 
@@ -14205,7 +14273,7 @@ msgstr ""
 "The maximum lease time specifies after how many seconds the client must "
 "request a new IP address."
 
-#: ../lib/modules/kolabUser.inc:175
+#: ../lib/modules/kolabUser.inc:178
 msgid "The maximum mailbox size in MB."
 msgstr "The maximum mailbox size in MB."
 
@@ -14221,17 +14289,17 @@ msgstr ""
 "The maximum number of pages per job allowed on the printer. 0 means "
 "unlimited."
 
-#: ../lib/modules/bindDLZ.inc:525 ../lib/modules/bindDLZ.inc:526
+#: ../lib/modules/bindDLZ.inc:528 ../lib/modules/bindDLZ.inc:529
 #, php-format
 msgid "The minimum time \"%s\" must be a number."
 msgstr "The minimum time \"%s\" must be a number."
 
-#: ../lib/modules.inc:945
+#: ../lib/modules.inc:953
 #, php-format
 msgid "The module %s is not yet ready."
 msgstr "The module %s is not yet ready."
 
-#: ../templates/pdfedit/pdfpage.php:112
+#: ../templates/pdfedit/pdfpage.php:130
 msgid ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must consist of the following characters: 'a-z','A-Z','0-9','_','-'."
@@ -14239,7 +14307,7 @@ msgstr ""
 "The name for that PDF-structure you submitted is not valid. A valid name "
 "must consist of the following characters: 'a-z','A-Z','0-9','_','-'."
 
-#: ../lib/modules/asteriskExtension.inc:111
+#: ../lib/modules/asteriskExtension.inc:113
 msgid ""
 "The name of a command to execute. The available commands may be listed at "
 "the Asterisk command line by executing \"core show applications\"."
@@ -14247,15 +14315,15 @@ msgstr ""
 "The name of a command to execute. The available commands may be listed at "
 "the Asterisk command line by executing \"core show applications\"."
 
-#: ../lib/modules/fixed_ip.inc:99
+#: ../lib/modules/fixed_ip.inc:102
 msgid "The name of the PC."
 msgstr "The name of the PC."
 
-#: ../lib/modules/asteriskExtension.inc:103
+#: ../lib/modules/asteriskExtension.inc:105
 msgid "The name of the extension (e.g. voicemail or sip)."
 msgstr "The name of the extension (e.g. voicemail or sip)."
 
-#: ../lib/modules/kolabUser.inc:149 ../lib/modules/kolabSharedFolder.inc:155
+#: ../lib/modules/kolabUser.inc:152 ../lib/modules/kolabSharedFolder.inc:155
 msgid "The name of the server where the mailbox is located."
 msgstr "The name of the server where the mailbox is located."
 
@@ -14267,12 +14335,12 @@ msgstr "The name of the subnet. Example: 192.168.10.0"
 msgid "The name of your Windows domain or workgroup."
 msgstr "The name of your Windows domain or workgroup."
 
-#: ../lib/modules/bindDLZ.inc:506 ../lib/modules/bindDLZ.inc:507
+#: ../lib/modules/bindDLZ.inc:509 ../lib/modules/bindDLZ.inc:510
 #, php-format
 msgid "The name server \"%s\" is invalid."
 msgstr "The name server \"%s\" is invalid."
 
-#: ../lib/modules/bindDLZ.inc:156 ../lib/modules/bindDLZ.inc:160
+#: ../lib/modules/bindDLZ.inc:159 ../lib/modules/bindDLZ.inc:163
 msgid "The name server for this zone."
 msgstr "The name server for this zone."
 
@@ -14292,7 +14360,7 @@ msgstr ""
 msgid "The net mask is invalid."
 msgstr "The net mask is invalid."
 
-#: ../lib/modules.inc:1209
+#: ../lib/modules.inc:1217
 msgid ""
 "The new password will be stored in the directory after you save this account."
 msgstr ""
@@ -14302,7 +14370,7 @@ msgstr ""
 msgid "The number of milliseconds for the last qualify."
 msgstr "The number of milliseconds for the last qualify."
 
-#: ../lib/modules/bindDLZ.inc:516
+#: ../lib/modules/bindDLZ.inc:519
 msgid "The number of priority, weight, port and server entries must be equal."
 msgstr "The number of priority, weight, port and server entries must be equal."
 
@@ -14320,17 +14388,17 @@ msgstr ""
 "fixed list of DNs or LAM can search LDAP to find a DN which matches the "
 "given user name."
 
-#: ../templates/tests/schemaTest.php:114
+#: ../templates/tests/schemaTest.php:117
 #, php-format
 msgid "The object class %s is not supported by your LDAP server."
 msgstr "The object class %s is not supported by your LDAP server."
 
-#: ../lib/modules/windowsUser.inc:167 ../lib/modules/inetOrgPerson.inc:820
-#: ../lib/modules/inetOrgPerson.inc:824
+#: ../lib/modules/windowsUser.inc:167 ../lib/modules/inetOrgPerson.inc:818
+#: ../lib/modules/inetOrgPerson.inc:822
 msgid "The office name of the user (e.g. YourCompany, Human Resources)."
 msgstr "The office name of the user (e.g. YourCompany, Human Resources)."
 
-#: ../templates/selfService/selfServiceMain.php:396 ../lib/modules.inc:1845
+#: ../templates/selfService/selfServiceMain.php:405 ../lib/modules.inc:1853
 msgid "The operation was stopped because of the above errors."
 msgstr "The operation was stopped because of the above errors."
 
@@ -14339,11 +14407,11 @@ msgstr "The operation was stopped because of the above errors."
 msgid "The options have bad format."
 msgstr "The options have bad format."
 
-#: ../lib/modules/device.inc:70 ../lib/modules/device.inc:74
+#: ../lib/modules/device.inc:73 ../lib/modules/device.inc:77
 msgid "The owners of this device."
 msgstr "The owners of this device."
 
-#: ../lib/modules/groupOfNames.inc:94 ../lib/modules/groupOfNames.inc:98
+#: ../lib/modules/groupOfNames.inc:97 ../lib/modules/groupOfNames.inc:101
 msgid "The owners of this group."
 msgstr "The owners of this group."
 
@@ -14360,7 +14428,7 @@ msgstr "The parameter @@password@@ will be replaced with the new password."
 msgid "The parameter @@principal@@ will be replaced with the principal name."
 msgstr "The parameter @@principal@@ will be replaced with the principal name."
 
-#: ../templates/config/confsave.php:71 ../templates/config/confmain.php:73
+#: ../templates/config/confsave.php:71 ../templates/config/confmain.php:76
 #: ../templates/config/mainlogin.php:65
 #: ../templates/selfService/adminLogin.php:55
 msgid "The password is invalid! Please try again."
@@ -14453,34 +14521,34 @@ msgstr ""
 "The password of your IMAP admin user. The login name for the IMAP admin user "
 "is stored in the LAM server profile."
 
-#: ../templates/lists/changePassword.php:659 ../lib/modules.inc:1152
+#: ../templates/lists/changePassword.php:660 ../lib/modules.inc:1160
 msgid "The password was set to:"
 msgstr "The password was set to:"
 
-#: ../lib/modules/range.inc:122
+#: ../lib/modules/range.inc:125
 msgid "The pool's failover peer."
 msgstr "The pool's failover peer."
 
-#: ../lib/modules/range.inc:118
+#: ../lib/modules/range.inc:121
 msgid "The pool's name."
 msgstr "The pool's name."
 
-#: ../lib/modules/bindDLZ.inc:512 ../lib/modules/bindDLZ.inc:513
+#: ../lib/modules/bindDLZ.inc:515 ../lib/modules/bindDLZ.inc:516
 #, php-format
 msgid "The port \"%s\" is invalid."
 msgstr "The port \"%s\" is invalid."
 
-#: ../lib/modules/windowsUser.inc:175 ../lib/modules/inetOrgPerson.inc:693
-#: ../lib/modules/inetOrgPerson.inc:697
+#: ../lib/modules/windowsUser.inc:175 ../lib/modules/inetOrgPerson.inc:691
+#: ../lib/modules/inetOrgPerson.inc:695
 msgid "The post office box of the user's address."
 msgstr "The post office box of the user's address."
 
-#: ../lib/modules/windowsUser.inc:171 ../lib/modules/inetOrgPerson.inc:701
-#: ../lib/modules/inetOrgPerson.inc:705
+#: ../lib/modules/windowsUser.inc:171 ../lib/modules/inetOrgPerson.inc:699
+#: ../lib/modules/inetOrgPerson.inc:703
 msgid "The postal code of the user's address."
 msgstr "The postal code of the user's address."
 
-#: ../lib/modules/bindDLZ.inc:502 ../lib/modules/bindDLZ.inc:503
+#: ../lib/modules/bindDLZ.inc:505 ../lib/modules/bindDLZ.inc:506
 #, php-format
 msgid "The preference \"%s\" must be a number."
 msgstr "The preference \"%s\" must be a number."
@@ -14509,12 +14577,12 @@ msgstr "The primary group the host should be member of."
 msgid "The primary group the user should be member of."
 msgstr "The primary group the user should be member of."
 
-#: ../lib/modules/bindDLZ.inc:508 ../lib/modules/bindDLZ.inc:509
+#: ../lib/modules/bindDLZ.inc:511 ../lib/modules/bindDLZ.inc:512
 #, php-format
 msgid "The priority \"%s\" is invalid."
 msgstr "The priority \"%s\" is invalid."
 
-#: ../lib/modules/asteriskExtension.inc:107
+#: ../lib/modules/asteriskExtension.inc:109
 msgid ""
 "The priority is a sequence number used to order the execution of commands. "
 "Commands are executed beginning with the lowest sequence number."
@@ -14522,25 +14590,25 @@ msgstr ""
 "The priority is a sequence number used to order the execution of commands. "
 "Commands are executed beginning with the lowest sequence number."
 
-#: ../lib/modules/range.inc:511 ../lib/modules/range.inc:591
+#: ../lib/modules/range.inc:514 ../lib/modules/range.inc:594
 msgid "The range conflicts with another range."
 msgstr "The range conflicts with another range."
 
-#: ../lib/modules/range.inc:507 ../lib/modules/range.inc:585
+#: ../lib/modules/range.inc:510 ../lib/modules/range.inc:588
 msgid "The range end needs to be greater than the range start."
 msgstr "The range end needs to be greater than the range start."
 
-#: ../lib/modules/bindDLZ.inc:521 ../lib/modules/bindDLZ.inc:522
+#: ../lib/modules/bindDLZ.inc:524 ../lib/modules/bindDLZ.inc:525
 #, php-format
 msgid "The refresh time \"%s\" must be a number."
 msgstr "The refresh time \"%s\" must be a number."
 
-#: ../lib/modules/bindDLZ.inc:523 ../lib/modules/bindDLZ.inc:524
+#: ../lib/modules/bindDLZ.inc:526 ../lib/modules/bindDLZ.inc:527
 #, php-format
 msgid "The retry time \"%s\" must be a number."
 msgstr "The retry time \"%s\" must be a number."
 
-#: ../lib/modules/inetOrgPerson.inc:788
+#: ../lib/modules/inetOrgPerson.inc:786
 msgid "The room number of the employee's office."
 msgstr "The room number of the employee's office."
 
@@ -14559,12 +14627,12 @@ msgstr ""
 #: ../lib/modules/nisMailAliasUser.inc:105
 #: ../lib/modules/asteriskAccount.inc:244 ../lib/modules/qmailUser.inc:196
 #: ../lib/modules/zarafaGroup.inc:114 ../lib/modules/sambaSamAccount.inc:401
-#: ../lib/modules/posixAccount.inc:383 ../lib/modules/zarafaUser.inc:147
-#: ../lib/modules/windowsUser.inc:252 ../lib/modules/inetOrgPerson.inc:836
+#: ../lib/modules/posixAccount.inc:383 ../lib/modules/zarafaUser.inc:150
+#: ../lib/modules/windowsUser.inc:252 ../lib/modules/inetOrgPerson.inc:834
 #: ../lib/modules/freeRadius.inc:129 ../lib/modules/zarafaServer.inc:89
-#: ../lib/modules/qmailGroup.inc:120 ../lib/modules/organizationalRole.inc:82
+#: ../lib/modules/qmailGroup.inc:120 ../lib/modules/organizationalRole.inc:85
 #: ../lib/modules/passwordSelfReset.inc:165
-#: ../lib/modules/windowsGroup.inc:113 ../lib/modules/groupOfNames.inc:82
+#: ../lib/modules/windowsGroup.inc:116 ../lib/modules/groupOfNames.inc:85
 msgid ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
@@ -14572,17 +14640,17 @@ msgstr ""
 "The selected options will not be managed inside LAM. You can use this to "
 "reduce the number of displayed input fields."
 
-#: ../lib/modules/bindDLZ.inc:527 ../lib/modules/bindDLZ.inc:528
+#: ../lib/modules/bindDLZ.inc:530 ../lib/modules/bindDLZ.inc:531
 #, php-format
 msgid "The serial number \"%s\" must be a number."
 msgstr "The serial number \"%s\" must be a number."
 
-#: ../lib/modules/bindDLZ.inc:228
+#: ../lib/modules/bindDLZ.inc:231
 msgid "The serial number should be updated after each zone change."
 msgstr "The serial number should be updated after each zone change."
 
-#: ../lib/modules/bindDLZ.inc:500 ../lib/modules/bindDLZ.inc:501
-#: ../lib/modules/bindDLZ.inc:514 ../lib/modules/bindDLZ.inc:515
+#: ../lib/modules/bindDLZ.inc:503 ../lib/modules/bindDLZ.inc:504
+#: ../lib/modules/bindDLZ.inc:517 ../lib/modules/bindDLZ.inc:518
 #, php-format
 msgid "The server name \"%s\" is invalid."
 msgstr "The server name \"%s\" is invalid."
@@ -14591,29 +14659,29 @@ msgstr "The server name \"%s\" is invalid."
 msgid "The source and destination DN are the same."
 msgstr "The source and destination DN are the same."
 
-#: ../lib/modules/range.inc:98
+#: ../lib/modules/range.inc:101
 msgid "The starting IP address of the range."
 msgstr "The starting IP address of the range."
 
-#: ../lib/modules/windowsUser.inc:183 ../lib/modules/inetOrgPerson.inc:808
-#: ../lib/modules/inetOrgPerson.inc:812
+#: ../lib/modules/windowsUser.inc:183 ../lib/modules/inetOrgPerson.inc:806
+#: ../lib/modules/inetOrgPerson.inc:810
 msgid "The state where the user resides or works."
 msgstr "The state where the user resides or works."
 
-#: ../templates/pdfedit/pdfpage.php:129
+#: ../templates/pdfedit/pdfpage.php:147
 msgid "The static text must contain at least one character."
 msgstr "The static text must contain at least one character."
 
-#: ../lib/modules/windowsUser.inc:187 ../lib/modules/inetOrgPerson.inc:685
-#: ../lib/modules/inetOrgPerson.inc:689
+#: ../lib/modules/windowsUser.inc:187 ../lib/modules/inetOrgPerson.inc:683
+#: ../lib/modules/inetOrgPerson.inc:687
 msgid "The street name of the user's address."
 msgstr "The street name of the user's address."
 
-#: ../help/help.inc:325
+#: ../help/help.inc:337
 msgid "The subject of all mails."
 msgstr "The subject of all mails."
 
-#: ../help/help.inc:287
+#: ../help/help.inc:299
 msgid "The subject of all password mails."
 msgstr "The subject of all password mails."
 
@@ -14654,7 +14722,7 @@ msgstr "The sudo commands are executed with these group memberships."
 msgid "The sudo commands may be run as these users (e.g. root)."
 msgstr "The sudo commands may be run as these users (e.g. root)."
 
-#: ../lib/modules/bindDLZ.inc:220
+#: ../lib/modules/bindDLZ.inc:223
 msgid ""
 "The time (in seconds) a secondary server should wait before retrying a zone "
 "refresh."
@@ -14662,7 +14730,7 @@ msgstr ""
 "The time (in seconds) a secondary server should wait before retrying a zone "
 "refresh."
 
-#: ../lib/modules/bindDLZ.inc:216
+#: ../lib/modules/bindDLZ.inc:219
 msgid ""
 "The time (in seconds) that a secondary server should wait before checking "
 "for zone updates."
@@ -14670,7 +14738,7 @@ msgstr ""
 "The time (in seconds) that a secondary server should wait before checking "
 "for zone updates."
 
-#: ../lib/modules/bindDLZ.inc:212
+#: ../lib/modules/bindDLZ.inc:215
 msgid ""
 "The time (in seconds) that zone data is kept on a secondary server without "
 "receiving a zone refresh."
@@ -14678,22 +14746,22 @@ msgstr ""
 "The time (in seconds) that zone data is kept on a secondary server without "
 "receiving a zone refresh."
 
-#: ../lib/modules/bindDLZ.inc:479 ../lib/modules/bindDLZ.inc:480
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:482
-#: ../lib/modules/bindDLZ.inc:483 ../lib/modules/bindDLZ.inc:484
-#: ../lib/modules/bindDLZ.inc:485 ../lib/modules/bindDLZ.inc:486
-#: ../lib/modules/bindDLZ.inc:487 ../lib/modules/bindDLZ.inc:488
-#: ../lib/modules/bindDLZ.inc:489 ../lib/modules/bindDLZ.inc:490
-#: ../lib/modules/bindDLZ.inc:491 ../lib/modules/bindDLZ.inc:492
-#: ../lib/modules/bindDLZ.inc:493 ../lib/modules/bindDLZ.inc:494
+#: ../lib/modules/bindDLZ.inc:482 ../lib/modules/bindDLZ.inc:483
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:485
+#: ../lib/modules/bindDLZ.inc:486 ../lib/modules/bindDLZ.inc:487
+#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:489
+#: ../lib/modules/bindDLZ.inc:490 ../lib/modules/bindDLZ.inc:491
+#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:493
+#: ../lib/modules/bindDLZ.inc:494 ../lib/modules/bindDLZ.inc:495
+#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:497
 #, php-format
 msgid "The timeout \"%s\" must be a number."
 msgstr "The timeout \"%s\" must be a number."
 
-#: ../lib/modules/bindDLZ.inc:102 ../lib/modules/bindDLZ.inc:106
-#: ../lib/modules/bindDLZ.inc:111 ../lib/modules/bindDLZ.inc:116
-#: ../lib/modules/bindDLZ.inc:121 ../lib/modules/bindDLZ.inc:126
-#: ../lib/modules/bindDLZ.inc:131
+#: ../lib/modules/bindDLZ.inc:105 ../lib/modules/bindDLZ.inc:109
+#: ../lib/modules/bindDLZ.inc:114 ../lib/modules/bindDLZ.inc:119
+#: ../lib/modules/bindDLZ.inc:124 ../lib/modules/bindDLZ.inc:129
+#: ../lib/modules/bindDLZ.inc:134
 msgid ""
 "The timeout specifies how long (in seconds) a record can be cached by "
 "caching DNS servers."
@@ -14701,17 +14769,17 @@ msgstr ""
 "The timeout specifies how long (in seconds) a record can be cached by "
 "caching DNS servers."
 
-#: ../lib/modules/customFields.inc:3778 ../lib/modules/customFields.inc:3865
+#: ../lib/modules/customFields.inc:3776 ../lib/modules/customFields.inc:3863
 #, php-format
 msgid "The uploaded file does not have the correct file extension (%s)."
 msgstr "The uploaded file does not have the correct file extension (%s)."
 
-#: ../lib/modules/customFields.inc:3774 ../lib/modules/customFields.inc:3861
+#: ../lib/modules/customFields.inc:3772 ../lib/modules/customFields.inc:3859
 #, php-format
 msgid "The uploaded file is too large (> %s bytes)."
 msgstr "The uploaded file is too large (> %s bytes)."
 
-#: ../lib/modules/ldapPublicKey.inc:129
+#: ../lib/modules/ldapPublicKey.inc:132
 msgid "The uploaded file seems to be no valid public key."
 msgstr "The uploaded file seems to be no valid public key."
 
@@ -14719,7 +14787,7 @@ msgstr "The uploaded file seems to be no valid public key."
 msgid "The url attribute value should begin with file://."
 msgstr "The url attribute value should begin with file://."
 
-#: ../lib/modules/zarafaUser.inc:127
+#: ../lib/modules/zarafaUser.inc:130
 msgid "The user account is non-active and login is disabled."
 msgstr "The user account is non-active and login is disabled."
 
@@ -14727,7 +14795,7 @@ msgstr "The user account is non-active and login is disabled."
 msgid "The user must log on using a smart card."
 msgstr "The user must log on using a smart card."
 
-#: ../lib/modules/zarafaUser.inc:107
+#: ../lib/modules/zarafaUser.inc:110
 msgid "The user will get warned when his mailbox reaches this limit."
 msgstr "The user will get warned when his mailbox reaches this limit."
 
@@ -14740,51 +14808,51 @@ msgid "The user's call groups."
 msgstr "The user's call groups."
 
 #: ../lib/modules/qmailUser.inc:200 ../lib/modules/windowsUser.inc:155
-#: ../lib/modules/pykotaUser.inc:117 ../lib/modules/inetOrgPerson.inc:749
-#: ../lib/modules/inetOrgPerson.inc:753
+#: ../lib/modules/pykotaUser.inc:120 ../lib/modules/inetOrgPerson.inc:747
+#: ../lib/modules/inetOrgPerson.inc:751
 msgid "The user's email address."
 msgstr "The user's email address."
 
-#: ../lib/modules/windowsUser.inc:195 ../lib/modules/inetOrgPerson.inc:733
-#: ../lib/modules/inetOrgPerson.inc:737
+#: ../lib/modules/windowsUser.inc:195 ../lib/modules/inetOrgPerson.inc:731
+#: ../lib/modules/inetOrgPerson.inc:735
 msgid "The user's fax number."
 msgstr "The user's fax number."
 
-#: ../lib/modules/windowsUser.inc:367 ../lib/modules/inetOrgPerson.inc:725
-#: ../lib/modules/inetOrgPerson.inc:729
+#: ../lib/modules/windowsUser.inc:367 ../lib/modules/inetOrgPerson.inc:723
+#: ../lib/modules/inetOrgPerson.inc:727
 msgid "The user's mobile number."
 msgstr "The user's mobile number."
 
 #: ../lib/modules/windowsUser.inc:339 ../lib/modules/windowsUser.inc:343
-#: ../lib/modules/inetOrgPerson.inc:853 ../lib/modules/inetOrgPerson.inc:857
+#: ../lib/modules/inetOrgPerson.inc:851 ../lib/modules/inetOrgPerson.inc:855
 msgid "The user's organisation name."
 msgstr "The user's organisation name."
 
 #: ../lib/modules/windowsUser.inc:331 ../lib/modules/windowsUser.inc:335
-#: ../lib/modules/inetOrgPerson.inc:845 ../lib/modules/inetOrgPerson.inc:849
+#: ../lib/modules/inetOrgPerson.inc:843 ../lib/modules/inetOrgPerson.inc:847
 msgid "The user's organisational unit."
 msgstr "The user's organisational unit."
 
-#: ../lib/modules/windowsUser.inc:355 ../lib/modules/inetOrgPerson.inc:741
-#: ../lib/modules/inetOrgPerson.inc:745
+#: ../lib/modules/windowsUser.inc:355 ../lib/modules/inetOrgPerson.inc:739
+#: ../lib/modules/inetOrgPerson.inc:743
 msgid "The user's pager number."
 msgstr "The user's pager number."
 
-#: ../lib/modules/inetOrgPerson.inc:780 ../lib/modules/inetOrgPerson.inc:784
+#: ../lib/modules/inetOrgPerson.inc:778 ../lib/modules/inetOrgPerson.inc:782
 msgid "The user's private telephone number."
 msgstr "The user's private telephone number."
 
-#: ../lib/modules/windowsUser.inc:191 ../lib/modules/inetOrgPerson.inc:717
-#: ../lib/modules/inetOrgPerson.inc:721
+#: ../lib/modules/windowsUser.inc:191 ../lib/modules/inetOrgPerson.inc:715
+#: ../lib/modules/inetOrgPerson.inc:719
 msgid "The user's telephone number."
 msgstr "The user's telephone number."
 
-#: ../lib/modules/windowsUser.inc:307 ../lib/modules/inetOrgPerson.inc:861
+#: ../lib/modules/windowsUser.inc:307 ../lib/modules/inetOrgPerson.inc:859
 msgid "The user's unique employee number."
 msgstr "The user's unique employee number."
 
-#: ../lib/modules/windowsUser.inc:207 ../lib/modules/inetOrgPerson.inc:760
-#: ../lib/modules/inetOrgPerson.inc:764
+#: ../lib/modules/windowsUser.inc:207 ../lib/modules/inetOrgPerson.inc:758
+#: ../lib/modules/inetOrgPerson.inc:762
 msgid "The user's web site (e.g. http://www.company.com)."
 msgstr "The user's web site (e.g. http://www.company.com)."
 
@@ -14796,7 +14864,7 @@ msgstr ""
 "The value for the Samba 3 field \"User can/must change password\" needs to "
 "be a number."
 
-#: ../lib/modules/puppetClient.inc:199 ../lib/modules/puppetClient.inc:200
+#: ../lib/modules/puppetClient.inc:202 ../lib/modules/puppetClient.inc:203
 msgid "The variables may only contain ASCII characters."
 msgstr "The variables may only contain ASCII characters."
 
@@ -14805,7 +14873,7 @@ msgstr "The variables may only contain ASCII characters."
 msgid "The voicemail context name is invalid."
 msgstr "The voicemail context name is invalid."
 
-#: ../lib/modules/bindDLZ.inc:510 ../lib/modules/bindDLZ.inc:511
+#: ../lib/modules/bindDLZ.inc:513 ../lib/modules/bindDLZ.inc:514
 #, php-format
 msgid "The weight \"%s\" is invalid."
 msgstr "The weight \"%s\" is invalid."
@@ -14819,7 +14887,7 @@ msgstr "The were no attributes marked as an RDN attribute."
 msgid "The wildcard for the account creation link is @@creationLink@@."
 msgstr "The wildcard for the account creation link is @@creationLink@@."
 
-#: ../lib/modules/passwordSelfReset.inc:131 ../help/help.inc:292
+#: ../lib/modules/passwordSelfReset.inc:131 ../help/help.inc:304
 msgid "The wildcard for the new password is @@newPassword@@."
 msgstr "The wildcard for the new password is @@newPassword@@."
 
@@ -14832,11 +14900,11 @@ msgstr "The wildcard for the reset link is @@resetLink@@."
 msgid "There are <b>%s</b> members in group <b>%s</b>:"
 msgstr "There are <b>%s</b> members in group <b>%s</b>:"
 
-#: ../lib/modules/posixGroup.inc:672 ../lib/modules/sambaGroupMapping.inc:606
+#: ../lib/modules/posixGroup.inc:670 ../lib/modules/sambaGroupMapping.inc:604
 msgid "There are still users who have this group as their primary group."
 msgstr "There are still users who have this group as their primary group."
 
-#: ../lib/modules/sambaGroupMapping.inc:603
+#: ../lib/modules/sambaGroupMapping.inc:601
 msgid "There can be only one group of this type."
 msgstr "There can be only one group of this type."
 
@@ -14848,7 +14916,7 @@ msgstr "There is already another user with this caller ID."
 msgid "There is already another user with this mailbox name."
 msgstr "There is already another user with this mailbox name."
 
-#: ../templates/massDoUpload.php:259
+#: ../lib/upload.inc:196
 msgid "There were errors while uploading:"
 msgstr "There were errors while uploading:"
 
@@ -14887,11 +14955,11 @@ msgstr ""
 "new user accounts. The range should be different from that of machines. New "
 "user accounts will always get the highest number in use plus one."
 
-#: ../lib/modules/inetOrgPerson.inc:873
+#: ../lib/modules/inetOrgPerson.inc:871
 msgid "These are the user's certificates."
 msgstr "These are the user's certificates."
 
-#: ../lib/modules/puppetClient.inc:118
+#: ../lib/modules/puppetClient.inc:121
 msgid ""
 "These classes will be available as autocompletion hints when adding new "
 "classes."
@@ -14899,7 +14967,7 @@ msgstr ""
 "These classes will be available as autocompletion hints when adding new "
 "classes."
 
-#: ../lib/modules/nisnetgroup.inc:96 ../lib/modules/nisnetgroup.inc:100
+#: ../lib/modules/nisnetgroup.inc:99 ../lib/modules/nisnetgroup.inc:103
 msgid ""
 "These entries specify the members of the netgroup. You can limit the set to "
 "a host name, a user name, a domain name or any combination of them."
@@ -14907,7 +14975,7 @@ msgstr ""
 "These entries specify the members of the netgroup. You can limit the set to "
 "a host name, a user name, a domain name or any combination of them."
 
-#: ../lib/modules/puppetClient.inc:122
+#: ../lib/modules/puppetClient.inc:125
 msgid ""
 "These environments will be available as autocompletion hints when setting "
 "the environment."
@@ -14915,7 +14983,7 @@ msgstr ""
 "These environments will be available as autocompletion hints when setting "
 "the environment."
 
-#: ../lib/modules/asteriskExtension.inc:123
+#: ../lib/modules/asteriskExtension.inc:125
 msgid ""
 "These options change the list of potential extension owners below. You can "
 "select to show Asterisk accounts or all users. It is also possible to search "
@@ -14947,11 +15015,11 @@ msgstr ""
 msgid "This MAC address is already in use."
 msgstr "This MAC address is already in use."
 
-#: ../lib/modules/fixed_ip.inc:462
+#: ../lib/modules/fixed_ip.inc:465
 msgid "This PC name already exists."
 msgstr "This PC name already exists."
 
-#: ../lib/modules/kolabGroup.inc:197 ../lib/modules/kolabUser.inc:292
+#: ../lib/modules/kolabGroup.inc:197 ../lib/modules/kolabUser.inc:295
 #: ../lib/modules/kolabSharedFolder.inc:274
 msgid "This account is marked for deletion."
 msgstr "This account is marked for deletion."
@@ -14976,7 +15044,7 @@ msgstr "This attribute is required"
 msgid "This attribute is required for the RDN."
 msgstr "This attribute is required for the RDN."
 
-#: ../lib/modules/windowsUser.inc:303 ../lib/modules/inetOrgPerson.inc:816
+#: ../lib/modules/windowsUser.inc:303 ../lib/modules/inetOrgPerson.inc:814
 msgid "This can be used to specify if the user has a car license."
 msgstr "This can be used to specify if the user has a car license."
 
@@ -14992,7 +15060,7 @@ msgstr "This changes the password of the selected profile."
 msgid "This changes the profile which is selected by default at login."
 msgstr "This changes the profile which is selected by default at login."
 
-#: ../templates/massBuildAccounts.php:176
+#: ../templates/upload/massBuildAccounts.php:187
 msgid ""
 "This column is defined to include unique entries but duplicates were found:"
 msgstr ""
@@ -15042,7 +15110,7 @@ msgstr ""
 "This defines the rights for the home directories which are created by "
 "lamdaemon."
 
-#: ../lib/modules/asteriskExtension.inc:95
+#: ../lib/modules/asteriskExtension.inc:97
 msgid ""
 "This defines what application Asterisk has to start for this user (e.g. SIP/"
 "user1)."
@@ -15055,7 +15123,7 @@ msgstr ""
 msgid "This deletion request also includes %s child entries."
 msgstr "This deletion request also includes %s child entries."
 
-#: ../lib/modules/device.inc:78
+#: ../lib/modules/device.inc:81
 msgid "This describes the location of the device."
 msgstr "This describes the location of the device."
 
@@ -15063,8 +15131,8 @@ msgstr "This describes the location of the device."
 msgid "This describes the location of the host."
 msgstr "This describes the location of the host."
 
-#: ../lib/modules/windowsUser.inc:151 ../lib/modules/inetOrgPerson.inc:800
-#: ../lib/modules/inetOrgPerson.inc:804
+#: ../lib/modules/windowsUser.inc:151 ../lib/modules/inetOrgPerson.inc:798
+#: ../lib/modules/inetOrgPerson.inc:802
 msgid "This describes the location of the user."
 msgstr "This describes the location of the user."
 
@@ -15072,25 +15140,25 @@ msgstr "This describes the location of the user."
 msgid "This document was automatically created by LDAP Account Manager"
 msgstr "This document was automatically created by LDAP Account Manager"
 
-#: ../help/help.inc:343
+#: ../help/help.inc:355
 msgid "This email address will be set as BCC address of all mails."
 msgstr "This email address will be set as BCC address of all mails."
 
-#: ../help/help.inc:339
+#: ../help/help.inc:351
 msgid "This email address will be set as CC address of all mails."
 msgstr "This email address will be set as CC address of all mails."
 
-#: ../help/help.inc:321
+#: ../help/help.inc:333
 msgid "This email address will be set as reply-to address of all mails."
 msgstr "This email address will be set as reply-to address of all mails."
 
-#: ../help/help.inc:296
+#: ../help/help.inc:308
 msgid ""
 "This email address will be set as reply-to address of all password mails."
 msgstr ""
 "This email address will be set as reply-to address of all password mails."
 
-#: ../help/help.inc:317
+#: ../help/help.inc:329
 msgid ""
 "This email address will be set as sender address of all mails. If empty the "
 "system default (php.ini) will be used."
@@ -15098,7 +15166,7 @@ msgstr ""
 "This email address will be set as sender address of all mails. If empty the "
 "system default (php.ini) will be used."
 
-#: ../help/help.inc:285
+#: ../help/help.inc:297
 msgid ""
 "This email address will be set as sender address of all password mails. If "
 "empty the system default (php.ini) will be used."
@@ -15155,15 +15223,15 @@ msgstr "This is a comma separated list of IP addresses."
 msgid "This is a comma separated list of MAC addresses."
 msgstr "This is a comma separated list of MAC addresses."
 
-#: ../lib/modules/kolabUser.inc:137 ../lib/modules/kolabSharedFolder.inc:143
+#: ../lib/modules/kolabUser.inc:140 ../lib/modules/kolabSharedFolder.inc:143
 msgid "This is a comma separated list of delegates."
 msgstr "This is a comma separated list of delegates."
 
-#: ../lib/modules/kolabUser.inc:145 ../lib/modules/kolabSharedFolder.inc:151
+#: ../lib/modules/kolabUser.inc:148 ../lib/modules/kolabSharedFolder.inc:151
 msgid "This is a comma separated list of eMail aliases."
 msgstr "This is a comma separated list of eMail aliases."
 
-#: ../lib/modules/kolabUser.inc:129
+#: ../lib/modules/kolabUser.inc:132
 msgid "This is a comma separated list of invitation policies."
 msgstr "This is a comma separated list of invitation policies."
 
@@ -15193,17 +15261,17 @@ msgstr ""
 "that user name, password and email address are mandatory anyway and need not "
 "be specified."
 
-#: ../lib/modules/windowsGroup.inc:137
+#: ../lib/modules/windowsGroup.inc:140
 msgid "This is a list of groups this group is member of."
 msgstr "This is a list of groups this group is member of."
 
-#: ../lib/modules/organizationalRole.inc:94
-#: ../lib/modules/windowsGroup.inc:133 ../lib/modules/groupOfNames.inc:102
+#: ../lib/modules/organizationalRole.inc:97
+#: ../lib/modules/windowsGroup.inc:136 ../lib/modules/groupOfNames.inc:105
 msgid "This is a list of members of this group."
 msgstr "This is a list of members of this group."
 
-#: ../lib/modules/organizationalRole.inc:98
-#: ../lib/modules/windowsGroup.inc:141 ../lib/modules/groupOfNames.inc:106
+#: ../lib/modules/organizationalRole.inc:101
+#: ../lib/modules/windowsGroup.inc:144 ../lib/modules/groupOfNames.inc:109
 msgid ""
 "This is a list of members of this group. Multiple members are separated by "
 "semicolons."
@@ -15272,12 +15340,12 @@ msgstr ""
 
 #: ../lib/passwordExpirationJob.inc:516
 #: ../lib/modules/zarafaDynamicGroup.inc:199 ../lib/modules/ipHost.inc:125
-#: ../lib/modules/posixGroup.inc:673 ../lib/modules/posixGroup.inc:674
-#: ../lib/modules/device.inc:142 ../lib/modules/eduPerson.inc:246
+#: ../lib/modules/posixGroup.inc:671 ../lib/modules/posixGroup.inc:672
+#: ../lib/modules/device.inc:145 ../lib/modules/eduPerson.inc:246
 #: ../lib/modules/eduPerson.inc:248 ../lib/modules/zarafaAddressList.inc:170
 #: ../lib/modules/posixAccount.inc:131 ../lib/modules/posixAccount.inc:132
-#: ../lib/modules/ppolicyUser.inc:561 ../lib/modules/windowsUser.inc:1001
-#: ../lib/modules/inetOrgPerson.inc:100 ../lib/modules/freeRadius.inc:342
+#: ../lib/modules/ppolicyUser.inc:559 ../lib/modules/windowsUser.inc:1001
+#: ../lib/modules/inetOrgPerson.inc:98 ../lib/modules/freeRadius.inc:342
 #: ../lib/modules/aliasEntry.inc:86 ../lib/modules/qmailGroup.inc:433
 #: ../lib/modules/qmailGroup.inc:434 ../lib/modules/qmailGroup.inc:435
 msgid "This is not a valid DN!"
@@ -15287,7 +15355,7 @@ msgstr "This is not a valid DN!"
 msgid "This is not a valid RID number!"
 msgstr "This is not a valid RID number!"
 
-#: ../lib/modules/sambaGroupMapping.inc:605
+#: ../lib/modules/sambaGroupMapping.inc:603
 msgid "This is not a valid Samba 3 group type!"
 msgstr "This is not a valid Samba 3 group type!"
 
@@ -15339,8 +15407,8 @@ msgstr ""
 msgid "This is the LDAP DN of the host's manager."
 msgstr "This is the LDAP DN of the host's manager."
 
-#: ../lib/modules/windowsUser.inc:347 ../lib/modules/inetOrgPerson.inc:677
-#: ../lib/modules/inetOrgPerson.inc:681
+#: ../lib/modules/windowsUser.inc:347 ../lib/modules/inetOrgPerson.inc:675
+#: ../lib/modules/inetOrgPerson.inc:679
 msgid ""
 "This is the LDAP DN of the user's manager. Use this property to represent "
 "hierarchies in your company."
@@ -15514,8 +15582,8 @@ msgstr "This is the mailbox size limit in bytes."
 msgid "This is the minimum length for answers to the security question."
 msgstr "This is the minimum length for answers to the security question."
 
-#: ../lib/modules/nisnetgroup.inc:84 ../lib/modules/organizationalRole.inc:86
-#: ../lib/modules/groupOfNames.inc:86
+#: ../lib/modules/nisnetgroup.inc:87 ../lib/modules/organizationalRole.inc:89
+#: ../lib/modules/groupOfNames.inc:89
 msgid "This is the name of this group."
 msgstr "This is the name of this group."
 
@@ -15525,11 +15593,11 @@ msgid ""
 msgstr ""
 "This is the natural name of the host. If empty, the host name will be used."
 
-#: ../lib/modules/pykotaUser.inc:109
+#: ../lib/modules/pykotaUser.inc:112
 msgid "This is the natural name of the user."
 msgstr "This is the natural name of the user."
 
-#: ../lib/modules/inetOrgPerson.inc:768
+#: ../lib/modules/inetOrgPerson.inc:766
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
 "used."
@@ -15678,7 +15746,7 @@ msgstr ""
 msgid "This is the user's primary Windows group."
 msgstr "This is the user's primary Windows group."
 
-#: ../lib/modules/puppetClient.inc:94
+#: ../lib/modules/puppetClient.inc:97
 msgid ""
 "This is this node's parent. All classes and variables are inherited from "
 "this node."
@@ -15694,12 +15762,12 @@ msgstr ""
 "This is typically used to allow incoming calls (e.g. from FWD) while having "
 "a type=friend entry defined with username and password."
 
-#: ../lib/modules/zarafaUser.inc:131
+#: ../lib/modules/zarafaUser.inc:134
 msgid "This is used to mark this account as resource."
 msgstr "This is used to mark this account as resource."
 
-#: ../lib/modules/qmailUser.inc:1239 ../lib/modules/windowsUser.inc:3553
-#: ../lib/modules/shadowAccount.inc:912 ../lib/modules/freeRadius.inc:833
+#: ../lib/modules/qmailUser.inc:1237 ../lib/modules/windowsUser.inc:3551
+#: ../lib/modules/shadowAccount.inc:910 ../lib/modules/freeRadius.inc:831
 msgid "This job deletes or moves user accounts when they expire."
 msgstr "This job deletes or moves user accounts when they expire."
 
@@ -15723,7 +15791,7 @@ msgstr "This mail address is already in use:"
 msgid "This mailbox will be created/deleted."
 msgstr "This mailbox will be created/deleted."
 
-#: ../lib/modules.inc:1270
+#: ../lib/modules.inc:1278
 msgid "This may overwrite existing values with profile data. Continue?"
 msgstr "This may overwrite existing values with profile data. Continue?"
 
@@ -15743,7 +15811,7 @@ msgstr ""
 "This name is shown on the login page as server name. Defaults to server "
 "address if empty."
 
-#: ../templates/schema/schema.php:350
+#: ../templates/schema/schema.php:351
 msgid "This object class is obsolete."
 msgstr "This object class is obsolete."
 
@@ -15771,7 +15839,7 @@ msgstr ""
 "bit which are saved as 21 hex (21*8 = 168) values. The first bit represents "
 "Sunday 0:00 - 0:59 in GMT."
 
-#: ../lib/modules/asteriskExtension.inc:192
+#: ../lib/modules/asteriskExtension.inc:194
 msgid "This pair of extension name and priority already exists."
 msgstr "This pair of extension name and priority already exists."
 
@@ -15785,7 +15853,7 @@ msgstr "This specifies the reconnect policy."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:96
 #: ../lib/modules/zarafaContact.inc:113 ../lib/modules/zarafaGroup.inc:118
-#: ../lib/modules/zarafaAddressList.inc:84 ../lib/modules/zarafaUser.inc:186
+#: ../lib/modules/zarafaAddressList.inc:84 ../lib/modules/zarafaUser.inc:189
 #: ../lib/modules/zarafaServer.inc:93
 msgid ""
 "This specifies the used Zarafa LDAP schema. Select LDAP for e.g. OpenLDAP, "
@@ -15802,6 +15870,14 @@ msgstr ""
 msgid "This specifies what to do when the client connection is broken."
 msgstr "This specifies what to do when the client connection is broken."
 
+#: ../help/help.inc:291
+msgid ""
+"This text is displayed on top of the 2-factor page. You can also input HTML "
+"code here."
+msgstr ""
+"This text is displayed on top of the 2-factor page. You can also input HTML "
+"code here."
+
 #: ../help/help.inc:265
 msgid ""
 "This text is displayed on top of the self service login page. You can also "
@@ -15847,12 +15923,12 @@ msgstr ""
 "This text will be sent as reply to all incoming mails if the delivery mode "
 "is set to autoreply."
 
-#: ../lib/tools/pdfEdit.inc:53
+#: ../lib/tools/pdfEdit.inc:54
 msgid "This tool allows you to customize the PDF pages."
 msgstr "This tool allows you to customize the PDF pages."
 
-#: ../templates/lists/changePassword.php:50
-#: ../templates/lists/changePassword.php:247
+#: ../templates/lists/changePassword.php:51
+#: ../templates/lists/changePassword.php:248
 msgid "This user is not supported or was not found."
 msgstr "This user is not supported or was not found."
 
@@ -15860,11 +15936,11 @@ msgstr "This user is not supported or was not found."
 msgid "This user name is only used for old Windows versions (e.g. NT4, W98)."
 msgstr "This user name is only used for old Windows versions (e.g. NT4, W98)."
 
-#: ../templates/lists/userlink.php:61
+#: ../templates/lists/userlink.php:62
 msgid "This user was not found!"
 msgstr "This user was not found!"
 
-#: ../lib/modules/zarafaUser.inc:436
+#: ../lib/modules/zarafaUser.inc:439
 msgid "This value can only be \"Room\" or \"Equipment\"."
 msgstr "This value can only be \"Room\" or \"Equipment\"."
 
@@ -15878,23 +15954,23 @@ msgstr "This value can only be \"Room\" or \"Equipment\"."
 #: ../lib/modules/sambaSamAccount.inc:113
 #: ../lib/modules/sambaSamAccount.inc:114
 #: ../lib/modules/sambaSamAccount.inc:115 ../lib/modules/posixAccount.inc:128
-#: ../lib/modules/zarafaUser.inc:443 ../lib/modules/zarafaUser.inc:445
-#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:447
-#: ../lib/modules/zarafaUser.inc:448 ../lib/modules/zarafaUser.inc:449
-#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/inetOrgPerson.inc:108
+#: ../lib/modules/zarafaUser.inc:446 ../lib/modules/zarafaUser.inc:448
+#: ../lib/modules/zarafaUser.inc:449 ../lib/modules/zarafaUser.inc:450
+#: ../lib/modules/zarafaUser.inc:451 ../lib/modules/zarafaUser.inc:452
+#: ../lib/modules/ppolicyUser.inc:102 ../lib/modules/inetOrgPerson.inc:106
 #: ../lib/modules/freeRadius.inc:341 ../lib/modules/zarafaServer.inc:179
 msgid "This value can only be \"true\" or \"false\"."
 msgstr "This value can only be \"true\" or \"false\"."
 
-#: ../lib/modules/zarafaUser.inc:444
+#: ../lib/modules/zarafaUser.inc:447
 msgid "This value can only be \"true\", \"false\" or \"system\"."
 msgstr "This value can only be \"true\", \"false\" or \"system\"."
 
-#: ../lib/modules/posixGroup.inc:671
+#: ../lib/modules/posixGroup.inc:669
 msgid "This value must be a list of user names separated by semicolons."
 msgstr "This value must be a list of user names separated by semicolons."
 
-#: ../help/help.inc:302
+#: ../help/help.inc:314
 msgid "This will create a new organisational unit under the selected one."
 msgstr "This will create a new organisational unit under the selected one."
 
@@ -15902,7 +15978,7 @@ msgstr "This will create a new organisational unit under the selected one."
 msgid "This will create the user's home directory on the specified server."
 msgstr "This will create the user's home directory on the specified server."
 
-#: ../help/help.inc:304
+#: ../help/help.inc:316
 msgid ""
 "This will delete the selected organisational unit. The OU has to be empty."
 msgstr ""
@@ -15912,13 +15988,21 @@ msgstr ""
 msgid "This will delete the selected profile."
 msgstr "This will delete the selected profile."
 
-#: ../lib/modules/kolabGroup.inc:118 ../lib/modules/puppetClient.inc:114
+#: ../help/help.inc:287
+msgid ""
+"This will disable the check of the SSL certificates for the 2-factor "
+"authentication service. Not recommended for production usage."
+msgstr ""
+"This will disable the check of the SSL certificates for the 2-factor "
+"authentication service. Not recommended for production usage."
+
+#: ../lib/modules/kolabGroup.inc:118 ../lib/modules/puppetClient.inc:117
 #: ../lib/modules/qmailUser.inc:264 ../lib/modules/zarafaContact.inc:94
 #: ../lib/modules/posixGroup.inc:539 ../lib/modules/eduPerson.inc:151
 #: ../lib/modules/pykotaGroup.inc:130 ../lib/modules/sambaSamAccount.inc:404
-#: ../lib/modules/posixAccount.inc:374 ../lib/modules/zarafaUser.inc:151
-#: ../lib/modules/pykotaUser.inc:161 ../lib/modules/shadowAccount.inc:198
-#: ../lib/modules/ldapPublicKey.inc:96 ../lib/modules/qmailGroup.inc:233
+#: ../lib/modules/posixAccount.inc:374 ../lib/modules/zarafaUser.inc:154
+#: ../lib/modules/pykotaUser.inc:164 ../lib/modules/shadowAccount.inc:198
+#: ../lib/modules/ldapPublicKey.inc:99 ../lib/modules/qmailGroup.inc:233
 #: ../lib/modules/authorizedServiceObject.inc:90
 #: ../lib/modules/passwordSelfReset.inc:157 ../lib/modules/hostObject.inc:84
 msgid "This will enable the extension automatically if this profile is loaded."
@@ -15945,7 +16029,7 @@ msgstr "This will not add the posixAccount object class to the account."
 msgid "This will reset the host's password to a default value."
 msgstr "This will reset the host's password to a default value."
 
-#: ../templates/lists/changePassword.php:320
+#: ../templates/lists/changePassword.php:321
 msgid ""
 "This will set a random password and display it on the screen or send it to "
 "the user via mail."
@@ -15953,7 +16037,7 @@ msgstr ""
 "This will set a random password and display it on the screen or send it to "
 "the user via mail."
 
-#: ../help/help.inc:283
+#: ../help/help.inc:295
 msgid ""
 "This will set a random password and display it on the screen or send it to "
 "the user via mail. Please edit your LAM server profile to setup the mail "
@@ -15963,7 +16047,7 @@ msgstr ""
 "the user via mail. Please edit your LAM server profile to setup the mail "
 "settings."
 
-#: ../lib/modules/kolabGroup.inc:114 ../lib/modules/kolabUser.inc:179
+#: ../lib/modules/kolabGroup.inc:114 ../lib/modules/kolabUser.inc:182
 #: ../lib/modules/kolabSharedFolder.inc:167
 msgid ""
 "This will set a special flag on the account which tells Kolabd to remove it. "
@@ -15986,13 +16070,13 @@ msgstr "Thursday"
 
 #: ../lib/modules/mitKerberos.inc:136 ../lib/modules/mitKerberos.inc:195
 #: ../lib/modules/mitKerberos.inc:230 ../lib/modules/mitKerberos.inc:254
-#: ../lib/modules/mitKerberos.inc:355 ../lib/modules/mitKerberos.inc:789
+#: ../lib/modules/mitKerberos.inc:355 ../lib/modules/mitKerberos.inc:787
 #: ../lib/modules/heimdalKerberos.inc:110
 #: ../lib/modules/heimdalKerberos.inc:164
 #: ../lib/modules/heimdalKerberos.inc:199
 #: ../lib/modules/heimdalKerberos.inc:221
 #: ../lib/modules/heimdalKerberos.inc:302
-#: ../lib/modules/heimdalKerberos.inc:701
+#: ../lib/modules/heimdalKerberos.inc:699
 msgid "Ticket lifetime"
 msgstr "Ticket lifetime"
 
@@ -16018,40 +16102,40 @@ msgstr "Time of user's last login."
 msgid "Time of user's last password change."
 msgstr "Time of user's last password change."
 
-#: ../templates/config/confmain.php:332
-#: ../templates/selfService/adminMain.php:479
+#: ../templates/config/confmain.php:335
+#: ../templates/selfService/adminMain.php:495
 #: ../lib/modules/sambaSamAccount.inc:349 ../help/help.inc:107
 msgid "Time zone"
 msgstr "Time zone"
 
-#: ../lib/modules/bindDLZ.inc:101 ../lib/modules/bindDLZ.inc:105
-#: ../lib/modules/bindDLZ.inc:110 ../lib/modules/bindDLZ.inc:115
-#: ../lib/modules/bindDLZ.inc:120 ../lib/modules/bindDLZ.inc:125
-#: ../lib/modules/bindDLZ.inc:130 ../lib/modules/bindDLZ.inc:261
-#: ../lib/modules/bindDLZ.inc:274 ../lib/modules/bindDLZ.inc:294
-#: ../lib/modules/bindDLZ.inc:307 ../lib/modules/bindDLZ.inc:338
-#: ../lib/modules/bindDLZ.inc:370 ../lib/modules/bindDLZ.inc:382
-#: ../lib/modules/bindDLZ.inc:409 ../lib/modules/bindDLZ.inc:430
-#: ../lib/modules/bindDLZ.inc:476 ../lib/modules/bindDLZ.inc:479
-#: ../lib/modules/bindDLZ.inc:481 ../lib/modules/bindDLZ.inc:483
-#: ../lib/modules/bindDLZ.inc:485 ../lib/modules/bindDLZ.inc:487
-#: ../lib/modules/bindDLZ.inc:489 ../lib/modules/bindDLZ.inc:491
-#: ../lib/modules/bindDLZ.inc:493 ../lib/modules/bindDLZ.inc:658
-#: ../lib/modules/bindDLZ.inc:761 ../lib/modules/bindDLZ.inc:840
-#: ../lib/modules/bindDLZ.inc:929 ../lib/modules/bindDLZ.inc:1041
-#: ../lib/modules/bindDLZ.inc:1173 ../lib/modules/bindDLZ.inc:1251
-#: ../lib/modules/bindDLZ.inc:1377 ../lib/modules/bindDLZ.inc:1480
-#: ../lib/modules/bindDLZ.inc:1499 ../lib/modules/bindDLZ.inc:1519
-#: ../lib/modules/bindDLZ.inc:1555 ../lib/modules/bindDLZ.inc:1577
-#: ../lib/modules/bindDLZ.inc:1606
+#: ../lib/modules/bindDLZ.inc:104 ../lib/modules/bindDLZ.inc:108
+#: ../lib/modules/bindDLZ.inc:113 ../lib/modules/bindDLZ.inc:118
+#: ../lib/modules/bindDLZ.inc:123 ../lib/modules/bindDLZ.inc:128
+#: ../lib/modules/bindDLZ.inc:133 ../lib/modules/bindDLZ.inc:264
+#: ../lib/modules/bindDLZ.inc:277 ../lib/modules/bindDLZ.inc:297
+#: ../lib/modules/bindDLZ.inc:310 ../lib/modules/bindDLZ.inc:341
+#: ../lib/modules/bindDLZ.inc:373 ../lib/modules/bindDLZ.inc:385
+#: ../lib/modules/bindDLZ.inc:412 ../lib/modules/bindDLZ.inc:433
+#: ../lib/modules/bindDLZ.inc:479 ../lib/modules/bindDLZ.inc:482
+#: ../lib/modules/bindDLZ.inc:484 ../lib/modules/bindDLZ.inc:486
+#: ../lib/modules/bindDLZ.inc:488 ../lib/modules/bindDLZ.inc:490
+#: ../lib/modules/bindDLZ.inc:492 ../lib/modules/bindDLZ.inc:494
+#: ../lib/modules/bindDLZ.inc:496 ../lib/modules/bindDLZ.inc:661
+#: ../lib/modules/bindDLZ.inc:764 ../lib/modules/bindDLZ.inc:843
+#: ../lib/modules/bindDLZ.inc:932 ../lib/modules/bindDLZ.inc:1044
+#: ../lib/modules/bindDLZ.inc:1176 ../lib/modules/bindDLZ.inc:1254
+#: ../lib/modules/bindDLZ.inc:1380 ../lib/modules/bindDLZ.inc:1481
+#: ../lib/modules/bindDLZ.inc:1500 ../lib/modules/bindDLZ.inc:1520
+#: ../lib/modules/bindDLZ.inc:1556 ../lib/modules/bindDLZ.inc:1578
+#: ../lib/modules/bindDLZ.inc:1607
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../lib/modules/bindDLZ.inc:437
+#: ../lib/modules/bindDLZ.inc:440
 msgid "Timeouts"
 msgstr "Timeouts"
 
-#: ../lib/modules/pykotaUser.inc:654 ../lib/modules/pykotaUser.inc:997
+#: ../lib/modules/pykotaUser.inc:657 ../lib/modules/pykotaUser.inc:998
 msgid "Title"
 msgstr "Title"
 
@@ -16063,19 +16147,19 @@ msgstr "To"
 msgid "To disable login use /bin/false."
 msgstr "To disable login use /bin/false."
 
-#: ../templates/config/confmain.php:483
+#: ../templates/config/confmain.php:486
 msgid "Tool settings"
 msgstr "Tool settings"
 
-#: ../templates/tools.php:63 ../templates/main_header.php:147
+#: ../templates/tools.php:64 ../templates/main_header.php:145
 msgid "Tools"
 msgstr "Tools"
 
-#: ../templates/serverInfo.php:357
+#: ../templates/serverInfo.php:358
 msgid "Total"
 msgstr "Total"
 
-#: ../templates/serverInfo.php:242 ../templates/serverInfo.php:247
+#: ../templates/serverInfo.php:243 ../templates/serverInfo.php:248
 msgid "Total connections"
 msgstr "Total connections"
 
@@ -16083,17 +16167,17 @@ msgstr "Total connections"
 msgid "Total entries"
 msgstr "Total entries"
 
-#: ../lib/modules/pykotaUser.inc:141
+#: ../lib/modules/pykotaUser.inc:144
 msgid "Total money paid by the user."
 msgstr "Total money paid by the user."
 
-#: ../lib/modules/pykotaUser.inc:140 ../lib/modules/pykotaUser.inc:264
-#: ../lib/modules/pykotaUser.inc:586 ../lib/modules/pykotaUser.inc:904
-#: ../lib/modules/pykotaUser.inc:961
+#: ../lib/modules/pykotaUser.inc:143 ../lib/modules/pykotaUser.inc:267
+#: ../lib/modules/pykotaUser.inc:589 ../lib/modules/pykotaUser.inc:905
+#: ../lib/modules/pykotaUser.inc:962
 msgid "Total paid"
 msgstr "Total paid"
 
-#: ../lib/modules/pykotaUser.inc:282
+#: ../lib/modules/pykotaUser.inc:285
 msgid "Total paid (read-only)"
 msgstr "Total paid (read-only)"
 
@@ -16101,15 +16185,15 @@ msgstr "Total paid (read-only)"
 msgid "Translate GID number to group name"
 msgstr "Translate GID number to group name"
 
-#: ../templates/config/confmain.php:259 ../help/help.inc:77
+#: ../templates/config/confmain.php:262 ../help/help.inc:77
 msgid "Tree suffix"
 msgstr "Tree suffix"
 
-#: ../templates/multiEdit.php:96 ../templates/main_header.php:178
+#: ../templates/multiEdit.php:119 ../templates/main_header.php:176
 msgid "Tree view"
 msgstr "Tree view"
 
-#: ../templates/config/confmain.php:670
+#: ../templates/config/confmain.php:707
 msgid "TreeSuffix is invalid!"
 msgstr "TreeSuffix is invalid!"
 
@@ -16117,18 +16201,18 @@ msgstr "TreeSuffix is invalid!"
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: ../templates/multiEdit.php:122 ../templates/selfService/profManage.php:205
-#: ../templates/schema/schema.php:348 ../lib/env.inc:155
-#: ../lib/modules/zarafaUser.inc:130 ../lib/modules/zarafaUser.inc:256
-#: ../lib/modules/zarafaUser.inc:380 ../lib/modules/zarafaUser.inc:564
-#: ../lib/modules/zarafaUser.inc:1289 ../lib/modules/zarafaUser.inc:1836
+#: ../templates/multiEdit.php:145 ../templates/selfService/profManage.php:205
+#: ../templates/schema/schema.php:349 ../lib/env.inc:155
+#: ../lib/modules/zarafaUser.inc:133 ../lib/modules/zarafaUser.inc:259
+#: ../lib/modules/zarafaUser.inc:383 ../lib/modules/zarafaUser.inc:567
+#: ../lib/modules/zarafaUser.inc:1290 ../lib/modules/zarafaUser.inc:1837
 #: ../lib/modules/kolabSharedFolder.inc:162
 #: ../lib/modules/kolabSharedFolder.inc:201
 #: ../lib/modules/kolabSharedFolder.inc:241
 #: ../lib/modules/kolabSharedFolder.inc:302
-#: ../lib/modules/kolabSharedFolder.inc:534
-#: ../lib/modules/customFields.inc:100 ../lib/modules/customFields.inc:1075
-#: ../lib/modules/customFields.inc:1726
+#: ../lib/modules/kolabSharedFolder.inc:532
+#: ../lib/modules/customFields.inc:100 ../lib/modules/customFields.inc:1073
+#: ../lib/modules/customFields.inc:1724
 msgid "Type"
 msgstr "Type"
 
@@ -16136,8 +16220,8 @@ msgstr "Type"
 msgid "UID"
 msgstr "UID"
 
-#: ../lib/modules/posixAccount.inc:439 ../lib/modules/posixAccount.inc:1893
-#: ../lib/modules/posixAccount.inc:1930
+#: ../lib/modules/posixAccount.inc:439 ../lib/modules/posixAccount.inc:1891
+#: ../lib/modules/posixAccount.inc:1928
 msgid "UID generator"
 msgstr "UID generator"
 
@@ -16160,15 +16244,15 @@ msgstr ""
 #: ../lib/types/host.inc:95 ../lib/types/user.inc:115
 #: ../lib/modules/qmailUser.inc:112 ../lib/modules/qmailUser.inc:231
 #: ../lib/modules/qmailUser.inc:332 ../lib/modules/qmailUser.inc:418
-#: ../lib/modules/qmailUser.inc:580 ../lib/modules/qmailUser.inc:1113
+#: ../lib/modules/qmailUser.inc:580 ../lib/modules/qmailUser.inc:1111
 #: ../lib/modules/zarafaContact.inc:120 ../lib/modules/zarafaContact.inc:161
 #: ../lib/modules/zarafaContact.inc:196 ../lib/modules/zarafaContact.inc:211
 #: ../lib/modules/zarafaContact.inc:212 ../lib/modules/zarafaContact.inc:230
-#: ../lib/modules/zarafaContact.inc:616 ../lib/modules/posixAccount.inc:108
+#: ../lib/modules/zarafaContact.inc:614 ../lib/modules/posixAccount.inc:108
 #: ../lib/modules/posixAccount.inc:232 ../lib/modules/posixAccount.inc:324
 #: ../lib/modules/posixAccount.inc:353 ../lib/modules/posixAccount.inc:390
 #: ../lib/modules/posixAccount.inc:394 ../lib/modules/posixAccount.inc:403
-#: ../lib/modules/posixAccount.inc:1418 ../lib/modules/posixAccount.inc:1849
+#: ../lib/modules/posixAccount.inc:1418 ../lib/modules/posixAccount.inc:1847
 msgid "UID number"
 msgstr "UID number"
 
@@ -16215,8 +16299,12 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/modules/bindDLZ.inc:1703 ../lib/modules/bindDLZ.inc:1712
-#: ../lib/modules/bindDLZ.inc:1745 ../lib/modules/bindDLZ.inc:2337
+#: ../help/help.inc:285
+msgid "URL of external 2-factor authentication service."
+msgstr "URL of external 2-factor authentication service."
+
+#: ../lib/modules/bindDLZ.inc:1704 ../lib/modules/bindDLZ.inc:1713
+#: ../lib/modules/bindDLZ.inc:1746 ../lib/modules/bindDLZ.inc:2338
 msgid "Unable to add DNS record."
 msgstr "Unable to add DNS record."
 
@@ -16224,17 +16312,17 @@ msgstr "Unable to add DNS record."
 msgid "Unable to change ACL on IMAP server for mailbox deletion."
 msgstr "Unable to change ACL on IMAP server for mailbox deletion."
 
-#: ../lib/modules/mitKerberos.inc:1174 ../lib/modules/mitKerberos.inc:1178
-#: ../lib/modules/heimdalKerberos.inc:1038
+#: ../lib/modules/mitKerberos.inc:1172 ../lib/modules/mitKerberos.inc:1176
+#: ../lib/modules/heimdalKerberos.inc:1036
 msgid "Unable to change Kerberos password."
 msgstr "Unable to change Kerberos password."
 
-#: ../lib/modules/windowsUser.inc:2740 ../lib/modules/windowsUser.inc:2789
-#: ../lib/modules/windowsUser.inc:2815
+#: ../lib/modules/windowsUser.inc:2738 ../lib/modules/windowsUser.inc:2787
+#: ../lib/modules/windowsUser.inc:2813
 msgid "Unable to change password."
 msgstr "Unable to change password."
 
-#: ../templates/selfService/selfServiceMain.php:403
+#: ../templates/selfService/selfServiceMain.php:412
 msgid ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
@@ -16242,7 +16330,7 @@ msgstr ""
 "Unable to change your account. Maybe you do not have enough rights to change "
 "the settings."
 
-#: ../templates/selfService/selfServiceMain.php:400
+#: ../templates/selfService/selfServiceMain.php:409
 msgid ""
 "Unable to change your account. Your changes might violate the password "
 "policy."
@@ -16258,7 +16346,7 @@ msgstr "Unable to connect to database."
 msgid "Unable to connect to remote server!"
 msgstr "Unable to connect to remote server!"
 
-#: ../templates/massDoUpload.php:193
+#: ../lib/upload.inc:270
 msgid "Unable to create ZIP file for PDF export."
 msgstr "Unable to create ZIP file for PDF export."
 
@@ -16272,36 +16360,36 @@ msgstr "Unable to create account."
 msgid "Unable to create mailbox on IMAP server."
 msgstr "Unable to create mailbox on IMAP server."
 
-#: ../templates/ou_edit.php:84
+#: ../templates/ou_edit.php:94
 msgid "Unable to create new OU!"
 msgstr "Unable to create new OU!"
 
-#: ../lib/types/automountType.inc:271
+#: ../lib/types/automountType.inc:248
 msgid "Unable to create new automount map."
 msgstr "Unable to create new automount map."
 
-#: ../templates/selfService/profManage.php:59 ../lib/config.inc:197
+#: ../templates/selfService/profManage.php:59 ../lib/config.inc:200
 msgid "Unable to create new profile!"
 msgstr "Unable to create new profile!"
 
-#: ../lib/types/bind.inc:216
+#: ../lib/types/bind.inc:193
 msgid "Unable to create new zone."
 msgstr "Unable to create new zone."
 
-#: ../lib/modules/bindDLZ.inc:1682
+#: ../lib/modules/bindDLZ.inc:1683
 #, php-format
 msgid "Unable to delete DNS record \"%s\"."
 msgstr "Unable to delete DNS record \"%s\"."
 
-#: ../lib/modules/bindDLZ.inc:1691 ../lib/modules/bindDLZ.inc:1741
+#: ../lib/modules/bindDLZ.inc:1692 ../lib/modules/bindDLZ.inc:1742
 msgid "Unable to delete DNS record."
 msgstr "Unable to delete DNS record."
 
-#: ../templates/ou_edit.php:101
+#: ../templates/ou_edit.php:111
 msgid "Unable to delete OU!"
 msgstr "Unable to delete OU!"
 
-#: ../templates/pdfedit/pdfmain.php:98
+#: ../templates/pdfedit/pdfmain.php:115
 msgid "Unable to delete PDF structure!"
 msgstr "Unable to delete PDF structure!"
 
@@ -16310,7 +16398,7 @@ msgstr "Unable to delete PDF structure!"
 msgid "Unable to delete entry, it does not exist"
 msgstr "Unable to delete entry, it does not exist"
 
-#: ../lib/pdfstruct.inc:291 ../lib/pdfstruct.inc:303
+#: ../lib/pdfstruct.inc:303 ../lib/pdfstruct.inc:315
 msgid "Unable to delete logo file."
 msgstr "Unable to delete logo file."
 
@@ -16320,8 +16408,8 @@ msgstr "Unable to delete mailbox from IMAP server."
 
 #: ../templates/config/profmanage.php:116
 #: ../templates/selfService/profManage.php:87
-#: ../templates/profedit/profilemain.php:113 ../lib/config.inc:210
-#: ../lib/config.inc:222 ../lib/config.inc:229 ../lib/config.inc:237
+#: ../templates/profedit/profilemain.php:132 ../lib/config.inc:213
+#: ../lib/config.inc:225 ../lib/config.inc:232 ../lib/config.inc:240
 msgid "Unable to delete profile!"
 msgstr "Unable to delete profile!"
 
@@ -16330,31 +16418,31 @@ msgstr "Unable to delete profile!"
 msgid "Unable to find a printer with name \"%s\"."
 msgstr "Unable to find a printer with name \"%s\"."
 
-#: ../lib/modules/posixAccount.inc:2211 ../lib/modules/posixAccount.inc:2220
-#: ../lib/modules/posixAccount.inc:2504 ../lib/modules/nisNetGroupUser.inc:519
-#: ../lib/modules/nisnetgroup.inc:543 ../lib/modules/groupOfNamesUser.inc:401
+#: ../lib/modules/posixAccount.inc:2209 ../lib/modules/posixAccount.inc:2218
+#: ../lib/modules/posixAccount.inc:2502 ../lib/modules/nisNetGroupUser.inc:520
+#: ../lib/modules/nisnetgroup.inc:546 ../lib/modules/groupOfNamesUser.inc:399
 msgid "Unable to find group in LDAP."
 msgstr "Unable to find group in LDAP."
 
-#: ../lib/modules/passwordSelfReset.inc:1166
+#: ../lib/modules/passwordSelfReset.inc:1164
 msgid "Unable to find password security answer for this account."
 msgstr "Unable to find password security answer for this account."
 
-#: ../lib/modules/passwordSelfReset.inc:1150
-#: ../lib/modules/passwordSelfReset.inc:1397
+#: ../lib/modules/passwordSelfReset.inc:1148
+#: ../lib/modules/passwordSelfReset.inc:1395
 msgid "Unable to find password security question for this account."
 msgstr "Unable to find password security question for this account."
 
-#: ../lib/modules/organizationalRoleUser.inc:336
+#: ../lib/modules/organizationalRoleUser.inc:334
 msgid "Unable to find role in LDAP."
 msgstr "Unable to find role in LDAP."
 
-#: ../templates/login.php:610 ../templates/login.php:616
+#: ../templates/login.php:619 ../templates/login.php:625
 msgid "Unable to find the user name in LDAP."
 msgstr "Unable to find the user name in LDAP."
 
-#: ../lib/modules/passwordSelfReset.inc:1137
-#: ../lib/modules/passwordSelfReset.inc:1486
+#: ../lib/modules/passwordSelfReset.inc:1135
+#: ../lib/modules/passwordSelfReset.inc:1484
 msgid "Unable to find user account."
 msgstr "Unable to find user account."
 
@@ -16362,7 +16450,7 @@ msgstr "Unable to find user account."
 msgid "Unable to import server certificate. Please use the upload function."
 msgstr "Unable to import server certificate. Please use the upload function."
 
-#: ../lib/modules.inc:1563 ../lib/modules.inc:1567
+#: ../lib/modules.inc:1571 ../lib/modules.inc:1575
 msgid "Unable to load LDAP entry:"
 msgstr "Unable to load LDAP entry:"
 
@@ -16371,8 +16459,8 @@ msgstr "Unable to load LDAP entry:"
 msgid "Unable to load key %s."
 msgstr "Unable to load key %s."
 
-#: ../lib/profiles.inc:98 ../lib/profiles.inc:102 ../lib/selfService.inc:196
-#: ../lib/selfService.inc:200
+#: ../lib/profiles.inc:104 ../lib/profiles.inc:108 ../lib/selfService.inc:199
+#: ../lib/selfService.inc:203
 msgid "Unable to load profile!"
 msgstr "Unable to load profile!"
 
@@ -16384,7 +16472,7 @@ msgstr "Unable to locate mailbox on IMAP."
 msgid "Unable to login to remote server!"
 msgstr "Unable to login to remote server!"
 
-#: ../lib/modules/windowsUser.inc:1004 ../lib/modules/inetOrgPerson.inc:103
+#: ../lib/modules/windowsUser.inc:1004 ../lib/modules/inetOrgPerson.inc:101
 msgid "Unable to process this file."
 msgstr "Unable to process this file."
 
@@ -16402,10 +16490,10 @@ msgstr "Unable to read file."
 msgid "Unable to register your new account. Please try again."
 msgstr "Unable to register your new account. Please try again."
 
-#: ../lib/modules/passwordSelfReset.inc:1686
-#: ../lib/modules/passwordSelfReset.inc:1695
-#: ../lib/modules/passwordSelfReset.inc:1701
-#: ../lib/modules/passwordSelfReset.inc:1710
+#: ../lib/modules/passwordSelfReset.inc:1684
+#: ../lib/modules/passwordSelfReset.inc:1693
+#: ../lib/modules/passwordSelfReset.inc:1699
+#: ../lib/modules/passwordSelfReset.inc:1708
 msgid "Unable to reset password."
 msgstr "Unable to reset password."
 
@@ -16413,32 +16501,42 @@ msgstr "Unable to reset password."
 msgid "Unable to retrieve image"
 msgstr "Unable to retrieve image"
 
-#: ../templates/tests/schemaTest.php:61 ../templates/schema/schema.php:93
-#: ../templates/schema/schema.php:111 ../templates/schema/schema.php:272
-#: ../templates/schema/schema.php:306
+#: ../templates/tests/schemaTest.php:62 ../templates/schema/schema.php:94
+#: ../templates/schema/schema.php:112 ../templates/schema/schema.php:273
+#: ../templates/schema/schema.php:307
 msgid "Unable to retrieve schema!"
 msgstr "Unable to retrieve schema!"
 
-#: ../templates/selfService/adminMain.php:255
-#: ../templates/profedit/profilepage.php:128
+#: ../templates/selfService/adminMain.php:271
+#: ../templates/profedit/profilepage.php:144
 msgid "Unable to save profile!"
 msgstr "Unable to save profile!"
 
-#: ../lib/account.inc:1097 ../lib/account.inc:1135
+#: ../lib/account.inc:1103 ../lib/account.inc:1141
 msgid "Unable to send mail!"
 msgstr "Unable to send mail!"
 
-#: ../lib/modules/bindDLZ.inc:1732
+#: ../templates/login.php:334
+#: ../templates/selfService/selfServiceLogin.php:129
+msgid "Unable to start 2-factor authentication because no tokens were found."
+msgstr "Unable to start 2-factor authentication because no tokens were found."
+
+#: ../templates/login.php:330
+#: ../templates/selfService/selfServiceLogin.php:126
+msgid "Unable to start 2-factor authentication."
+msgstr "Unable to start 2-factor authentication."
+
+#: ../lib/modules/bindDLZ.inc:1733
 #, php-format
 msgid "Unable to update DNS record \"%s\"."
 msgstr "Unable to update DNS record \"%s\"."
 
-#: ../lib/pdfstruct.inc:249 ../lib/pdfstruct.inc:259 ../lib/pdfstruct.inc:262
+#: ../lib/pdfstruct.inc:260 ../lib/pdfstruct.inc:270 ../lib/pdfstruct.inc:273
 msgid "Unable to upload logo file."
 msgstr "Unable to upload logo file."
 
-#: ../lib/modules/passwordSelfReset.inc:1221
-#: ../lib/modules/passwordSelfReset.inc:1498
+#: ../lib/modules/passwordSelfReset.inc:1219
+#: ../lib/modules/passwordSelfReset.inc:1496
 msgid "Unable to verify your password reset request. Please try again."
 msgstr "Unable to verify your password reset request. Please try again."
 
@@ -16446,37 +16544,37 @@ msgstr "Unable to verify your password reset request. Please try again."
 msgid "Unable to verify your user creation request. Please try again."
 msgstr "Unable to verify your user creation request. Please try again."
 
-#: ../templates/serverInfo.php:293
+#: ../templates/serverInfo.php:294
 msgid "Unbind"
 msgstr "Unbind"
 
-#: ../lib/modules/windowsGroup.inc:68
+#: ../lib/modules/windowsGroup.inc:71
 msgid "Universal"
 msgstr "Universal"
 
-#: ../templates/lists/changePassword.php:417
-#: ../templates/lists/changePassword.php:457 ../lib/types/user.inc:284
+#: ../templates/lists/changePassword.php:418
+#: ../templates/lists/changePassword.php:458 ../lib/types/user.inc:284
 #: ../lib/types/user.inc:398 ../lib/types/user.inc:437
 #: ../lib/types/user.inc:963 ../lib/modules/posixGroup.inc:388
 #: ../lib/modules/posixAccount.inc:169
 msgid "Unix"
 msgstr "Unix"
 
-#: ../templates/tests/lamdaemonTest.php:216
+#: ../templates/tests/lamdaemonTest.php:218
 msgid "Unix account"
 msgstr "Unix account"
 
-#: ../lib/modules/posixAccount.inc:1551 ../lib/modules/posixAccount.inc:1983
+#: ../lib/modules/posixAccount.inc:1551 ../lib/modules/posixAccount.inc:1981
 msgid "Unix groups"
 msgstr "Unix groups"
 
 #: ../lib/modules/dhcp_settings.inc:206 ../lib/modules/dhcp_settings.inc:223
 #: ../lib/modules/dhcp_settings.inc:299 ../lib/modules/dhcp_settings.inc:604
-#: ../lib/modules/dhcp_settings.inc:685
+#: ../lib/modules/dhcp_settings.inc:683
 msgid "Unknown clients"
 msgstr "Unknown clients"
 
-#: ../lib/modules/kolabUser.inc:252 ../lib/modules/kolabSharedFolder.inc:256
+#: ../lib/modules/kolabUser.inc:255 ../lib/modules/kolabSharedFolder.inc:256
 #, php-format
 msgid "Unknown delegate address: %s"
 msgstr "Unknown delegate address: %s"
@@ -16490,20 +16588,20 @@ msgstr "Unkown change type"
 msgid "Unlock"
 msgstr "Unlock"
 
-#: ../templates/lists/changePassword.php:209
-#: ../templates/lists/changePassword.php:414
-#: ../templates/lists/changePassword.php:442
-#: ../templates/lists/changePassword.php:444
+#: ../templates/lists/changePassword.php:210
+#: ../templates/lists/changePassword.php:415
+#: ../templates/lists/changePassword.php:443
+#: ../templates/lists/changePassword.php:445
 #: ../lib/modules/ppolicyUser.inc:151
 msgid "Unlock account"
 msgstr "Unlock account"
 
-#: ../templates/lists/changePassword.php:269
+#: ../templates/lists/changePassword.php:270
 msgid "Unlock account?"
 msgstr "Unlock account?"
 
 #: ../lib/modules/posixGroup.inc:208 ../lib/modules/posixAccount.inc:1487
-#: ../lib/modules/inetOrgPerson.inc:1651
+#: ../lib/modules/inetOrgPerson.inc:1649
 msgid "Unlock password"
 msgstr "Unlock password"
 
@@ -16511,15 +16609,16 @@ msgstr "Unlock password"
 msgid "Unlocked"
 msgstr "Unlocked"
 
-#: ../templates/masscreate.php:106 ../templates/config/confmodules.php:415
+#: ../templates/config/confmodules.php:423
+#: ../templates/upload/masscreate.php:131
 msgid "Unsolved dependency:"
 msgstr "Unsolved dependency:"
 
-#: ../templates/pdfedit/pdfpage.php:477
+#: ../templates/pdfedit/pdfpage.php:492
 msgid "Up"
 msgstr "Up"
 
-#: ../templates/lists/changePassword.php:224
+#: ../templates/lists/changePassword.php:225
 msgid "Update Samba password timestamp"
 msgstr "Update Samba password timestamp"
 
@@ -16546,8 +16645,8 @@ msgstr "Update values"
 msgid "Updating object"
 msgstr "Updating object"
 
-#: ../templates/config/mainmanage.php:351 ../templates/pdfedit/pdfmain.php:252
-#: ../lib/modules/ldapPublicKey.inc:147 ../lib/modules/inetOrgPerson.inc:1921
+#: ../templates/config/mainmanage.php:351 ../templates/pdfedit/pdfmain.php:297
+#: ../lib/modules/ldapPublicKey.inc:150 ../lib/modules/inetOrgPerson.inc:1919
 msgid "Upload"
 msgstr "Upload"
 
@@ -16555,45 +16654,45 @@ msgstr "Upload"
 msgid "Upload CA certificate in DER/PEM format."
 msgstr "Upload CA certificate in DER/PEM format."
 
-#: ../lib/modules/ldapPublicKey.inc:92
+#: ../lib/modules/ldapPublicKey.inc:95
 msgid "Upload a file with one or more keys. Each line contains one key."
 msgstr "Upload a file with one or more keys. Each line contains one key."
 
-#: ../templates/massBuildAccounts.php:241
+#: ../templates/upload/massBuildAccounts.php:251
 msgid "Upload accounts to LDAP"
 msgstr "Upload accounts to LDAP"
 
-#: ../lib/modules/ldapPublicKey.inc:143 ../lib/modules/customFields.inc:168
-#: ../lib/modules/customFields.inc:3641
+#: ../lib/modules/ldapPublicKey.inc:146 ../lib/modules/customFields.inc:168
+#: ../lib/modules/customFields.inc:3639
 msgid "Upload file"
 msgstr "Upload file"
 
-#: ../templates/masscreate.php:277
+#: ../templates/upload/masscreate.php:303
 msgid "Upload file and create accounts"
 msgstr "Upload file and create accounts"
 
-#: ../templates/massDoUpload.php:255 ../lib/lists.inc:1092
+#: ../lib/upload.inc:195 ../lib/lists.inc:1078
 msgid "Upload has finished"
 msgstr "Upload has finished"
 
-#: ../lib/modules.inc:512
+#: ../lib/modules.inc:522
 #, php-format
 msgid "Upload was stopped after errors in %s module!"
 msgstr "Upload was stopped after errors in %s module!"
 
-#: ../lib/modules/windowsUser.inc:387 ../lib/modules/inetOrgPerson.inc:877
+#: ../lib/modules/windowsUser.inc:387 ../lib/modules/inetOrgPerson.inc:875
 msgid "Uploaded images will be cropped to these maximum values."
 msgstr "Uploaded images will be cropped to these maximum values."
 
-#: ../lib/pdfstruct.inc:256
+#: ../lib/pdfstruct.inc:267
 msgid "Uploaded logo file."
 msgstr "Uploaded logo file."
 
-#: ../templates/serverInfo.php:222
+#: ../templates/serverInfo.php:223
 msgid "Uptime"
 msgstr "Uptime"
 
-#: ../templates/schema/schema.php:209
+#: ../templates/schema/schema.php:210
 msgid "Usage"
 msgstr "Usage"
 
@@ -16608,7 +16707,7 @@ msgstr "Use * for all services."
 msgid "Use Unix password"
 msgstr "Use Unix password"
 
-#: ../templates/selfService/adminMain.php:444 ../help/help.inc:280
+#: ../templates/selfService/adminMain.php:460 ../help/help.inc:280
 msgid "Use for all operations"
 msgstr "Use for all operations"
 
@@ -16628,7 +16727,7 @@ msgstr ""
 "Use this to enter additional email addresses in format \"smtp:user@domain.com"
 "\"."
 
-#: ../help/help.inc:310
+#: ../help/help.inc:322
 msgid ""
 "Use this to enter an additional LDAP filter (e.g. \"(cn!=admin)\") to reduce "
 "the number of entries to modify."
@@ -16660,10 +16759,18 @@ msgstr "Use this to hide the caller ID."
 
 #: ../lib/modules/zarafaDynamicGroup.inc:80
 #: ../lib/modules/zarafaContact.inc:78 ../lib/modules/zarafaGroup.inc:91
-#: ../lib/modules/zarafaAddressList.inc:68 ../lib/modules/zarafaUser.inc:95
+#: ../lib/modules/zarafaAddressList.inc:68 ../lib/modules/zarafaUser.inc:98
 msgid "Use this to hide this entry from the address book."
 msgstr "Use this to hide this entry from the address book."
 
+#: ../help/help.inc:289
+msgid ""
+"Use this to overwrite the default label for the 2-factor input field. "
+"Default is \"PIN+Token\"."
+msgstr ""
+"Use this to overwrite the default label for the 2-factor input field. "
+"Default is \"PIN+Token\"."
+
 #: ../lib/modules/imapAccess.inc:121
 msgid ""
 "Use this to provide a list of folders (e.g. Trash) to add for new accounts."
@@ -16688,19 +16795,19 @@ msgstr ""
 msgid "Used balance for the billing code."
 msgstr "Used balance for the billing code."
 
-#: ../lib/modules/quota.inc:109 ../lib/modules/quota.inc:400
+#: ../lib/modules/quota.inc:112 ../lib/modules/quota.inc:403
 msgid "Used blocks"
 msgstr "Used blocks"
 
-#: ../lib/modules/quota.inc:110
+#: ../lib/modules/quota.inc:113
 msgid "Used blocks. 1000 blocks are usually 1MB"
 msgstr "Used blocks. 1000 blocks are usually 1MB"
 
-#: ../templates/schema/schema.php:268
+#: ../templates/schema/schema.php:269
 msgid "Used by attributes"
 msgstr "Used by attributes"
 
-#: ../templates/schema/schema.php:237
+#: ../templates/schema/schema.php:238
 msgid "Used by object classes"
 msgstr "Used by object classes"
 
@@ -16712,11 +16819,11 @@ msgstr "Used for calculating RIDs from UID/GID. Do not change if unsure."
 msgid "Used for registration context."
 msgstr "Used for registration context."
 
-#: ../lib/modules/quota.inc:131 ../lib/modules/quota.inc:404
+#: ../lib/modules/quota.inc:134 ../lib/modules/quota.inc:407
 msgid "Used inodes"
 msgstr "Used inodes"
 
-#: ../lib/modules/quota.inc:132
+#: ../lib/modules/quota.inc:135
 msgid "Used inodes (files)"
 msgstr "Used inodes (files)"
 
@@ -16735,8 +16842,8 @@ msgstr ""
 msgid "Used to regularly check that a device is still online."
 msgstr "Used to regularly check that a device is still online."
 
-#: ../lib/types/sudo.inc:78 ../lib/modules/nisnetgroup.inc:220
-#: ../lib/modules/nisnetgroup.inc:586 ../lib/modules/nisMailAlias.inc:350
+#: ../lib/types/sudo.inc:78 ../lib/modules/nisnetgroup.inc:223
+#: ../lib/modules/nisnetgroup.inc:587 ../lib/modules/nisMailAlias.inc:350
 msgid "User"
 msgstr "User"
 
@@ -16748,8 +16855,8 @@ msgstr "User accounts (e.g. Unix, Samba and Kolab)"
 #: ../lib/modules/asteriskAccount.inc:270
 #: ../lib/modules/asteriskAccount.inc:340
 #: ../lib/modules/asteriskAccount.inc:598
-#: ../lib/modules/asteriskAccount.inc:989
-#: ../lib/modules/asteriskAccount.inc:1244
+#: ../lib/modules/asteriskAccount.inc:987
+#: ../lib/modules/asteriskAccount.inc:1242
 msgid "User agent"
 msgstr "User agent"
 
@@ -16758,9 +16865,9 @@ msgstr "User agent"
 msgid "User can change password"
 msgstr "User can change password"
 
-#: ../lib/modules/inetOrgPerson.inc:166 ../lib/modules/inetOrgPerson.inc:872
-#: ../lib/modules/inetOrgPerson.inc:1596 ../lib/modules/inetOrgPerson.inc:2800
-#: ../lib/modules/inetOrgPerson.inc:3696
+#: ../lib/modules/inetOrgPerson.inc:164 ../lib/modules/inetOrgPerson.inc:870
+#: ../lib/modules/inetOrgPerson.inc:1594 ../lib/modules/inetOrgPerson.inc:2796
+#: ../lib/modules/inetOrgPerson.inc:3676
 msgid "User certificates"
 msgstr "User certificates"
 
@@ -16769,7 +16876,7 @@ msgstr "User certificates"
 msgid "User count: %s"
 msgstr "User count: %s"
 
-#: ../lib/modules/pykotaUser.inc:121
+#: ../lib/modules/pykotaUser.inc:124
 msgid "User description."
 msgstr "User description."
 
@@ -16777,7 +16884,7 @@ msgstr "User description."
 msgid "User description. If left empty first and last name will be used."
 msgstr "User description. If left empty first and last name will be used."
 
-#: ../lib/modules/inetOrgPerson.inc:653
+#: ../lib/modules/inetOrgPerson.inc:651
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "User description. If left empty sur- and give name will be used."
 
@@ -16785,85 +16892,85 @@ msgstr "User description. If left empty sur- and give name will be used."
 msgid "User description. If left empty user name will be used."
 msgstr "User description. If left empty user name will be used."
 
-#: ../templates/schema/schema.php:204
+#: ../templates/schema/schema.php:205
 msgid "User modification"
 msgstr "User modification"
 
 #: ../lib/modules/mitKerberos.inc:224 ../lib/modules/mitKerberos.inc:250
 #: ../lib/modules/mitKerberos.inc:374 ../lib/modules/mitKerberos.inc:640
-#: ../lib/modules/mitKerberos.inc:793 ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/mitKerberos.inc:791 ../lib/modules/sambaSamAccount.inc:300
 #: ../lib/modules/sambaSamAccount.inc:1125 ../lib/modules/windowsUser.inc:1185
 #: ../lib/modules/heimdalKerberos.inc:106
 #: ../lib/modules/heimdalKerberos.inc:193
 #: ../lib/modules/heimdalKerberos.inc:220
 #: ../lib/modules/heimdalKerberos.inc:332
 #: ../lib/modules/heimdalKerberos.inc:549
-#: ../lib/modules/heimdalKerberos.inc:697
+#: ../lib/modules/heimdalKerberos.inc:695
 msgid "User must change password"
 msgstr "User must change password"
 
-#: ../templates/lists/changePassword.php:280 ../templates/login.php:346
-#: ../templates/config/confmain.php:344 ../lib/types/alias.inc:91
+#: ../templates/lists/changePassword.php:281 ../templates/login.php:354
+#: ../templates/config/confmain.php:347 ../lib/types/alias.inc:91
 #: ../lib/types/user.inc:114 ../lib/types/user.inc:116
-#: ../lib/selfService.inc:398 ../lib/modules/mitKerberos.inc:116
+#: ../lib/selfService.inc:408 ../lib/modules/mitKerberos.inc:116
 #: ../lib/modules/mitKerberos.inc:211 ../lib/modules/mitKerberos.inc:249
-#: ../lib/modules/mitKerberos.inc:343 ../lib/modules/mitKerberos.inc:780
+#: ../lib/modules/mitKerberos.inc:343 ../lib/modules/mitKerberos.inc:778
 #: ../lib/modules/selfRegistration.inc:414
 #: ../lib/modules/selfRegistration.inc:501
 #: ../lib/modules/selfRegistration.inc:508 ../lib/modules/account.inc:85
 #: ../lib/modules/account.inc:101 ../lib/modules/account.inc:124
 #: ../lib/modules/account.inc:126 ../lib/modules/account.inc:127
-#: ../lib/modules/account.inc:210 ../lib/modules/account.inc:231
-#: ../lib/modules/account.inc:255 ../lib/modules/uidObject.inc:45
+#: ../lib/modules/account.inc:210 ../lib/modules/account.inc:229
+#: ../lib/modules/account.inc:253 ../lib/modules/uidObject.inc:45
 #: ../lib/modules/uidObject.inc:67 ../lib/modules/uidObject.inc:76
 #: ../lib/modules/uidObject.inc:85 ../lib/modules/uidObject.inc:100
-#: ../lib/modules/uidObject.inc:164 ../lib/modules/nisNetGroupHost.inc:76
-#: ../lib/modules/nisNetGroupHost.inc:99
-#: ../lib/modules/nisNetGroupHost.inc:218
-#: ../lib/modules/nisNetGroupHost.inc:262 ../lib/modules/posixAccount.inc:113
+#: ../lib/modules/uidObject.inc:162 ../lib/modules/nisNetGroupHost.inc:79
+#: ../lib/modules/nisNetGroupHost.inc:102
+#: ../lib/modules/nisNetGroupHost.inc:221
+#: ../lib/modules/nisNetGroupHost.inc:263 ../lib/modules/posixAccount.inc:113
 #: ../lib/modules/posixAccount.inc:114 ../lib/modules/posixAccount.inc:117
 #: ../lib/modules/posixAccount.inc:224 ../lib/modules/posixAccount.inc:350
 #: ../lib/modules/posixAccount.inc:461 ../lib/modules/posixAccount.inc:1405
-#: ../lib/modules/posixAccount.inc:1835 ../lib/modules/windowsUser.inc:122
+#: ../lib/modules/posixAccount.inc:1833 ../lib/modules/windowsUser.inc:122
 #: ../lib/modules/windowsUser.inc:398 ../lib/modules/windowsUser.inc:815
 #: ../lib/modules/windowsUser.inc:950 ../lib/modules/windowsUser.inc:1074
-#: ../lib/modules/windowsUser.inc:2425 ../lib/modules/pykotaUser.inc:112
-#: ../lib/modules/pykotaUser.inc:208 ../lib/modules/pykotaUser.inc:268
-#: ../lib/modules/pykotaUser.inc:311 ../lib/modules/pykotaUser.inc:313
-#: ../lib/modules/pykotaUser.inc:340 ../lib/modules/pykotaUser.inc:892
-#: ../lib/modules/nisnetgroup.inc:152 ../lib/modules/nisnetgroup.inc:482
-#: ../lib/modules/inetOrgPerson.inc:97 ../lib/modules/inetOrgPerson.inc:166
-#: ../lib/modules/inetOrgPerson.inc:643 ../lib/modules/inetOrgPerson.inc:771
-#: ../lib/modules/inetOrgPerson.inc:1242 ../lib/modules/inetOrgPerson.inc:1245
-#: ../lib/modules/inetOrgPerson.inc:2001 ../lib/modules/inetOrgPerson.inc:2142
-#: ../lib/modules/inetOrgPerson.inc:2855 ../lib/modules/inetOrgPerson.inc:3704
-#: ../lib/modules/inetOrgPerson.inc:3733
-#: ../lib/modules/passwordSelfReset.inc:639
-#: ../lib/modules/passwordSelfReset.inc:1045
-#: ../lib/modules/passwordSelfReset.inc:1238
+#: ../lib/modules/windowsUser.inc:2423 ../lib/modules/pykotaUser.inc:115
+#: ../lib/modules/pykotaUser.inc:211 ../lib/modules/pykotaUser.inc:271
+#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:316
+#: ../lib/modules/pykotaUser.inc:343 ../lib/modules/pykotaUser.inc:893
+#: ../lib/modules/nisnetgroup.inc:155 ../lib/modules/nisnetgroup.inc:485
+#: ../lib/modules/inetOrgPerson.inc:95 ../lib/modules/inetOrgPerson.inc:164
+#: ../lib/modules/inetOrgPerson.inc:641 ../lib/modules/inetOrgPerson.inc:769
+#: ../lib/modules/inetOrgPerson.inc:1240 ../lib/modules/inetOrgPerson.inc:1243
+#: ../lib/modules/inetOrgPerson.inc:1997 ../lib/modules/inetOrgPerson.inc:2138
+#: ../lib/modules/inetOrgPerson.inc:2857 ../lib/modules/inetOrgPerson.inc:3684
+#: ../lib/modules/inetOrgPerson.inc:3713
+#: ../lib/modules/passwordSelfReset.inc:637
+#: ../lib/modules/passwordSelfReset.inc:1043
+#: ../lib/modules/passwordSelfReset.inc:1236
 #: ../lib/modules/heimdalKerberos.inc:94
 #: ../lib/modules/heimdalKerberos.inc:180
 #: ../lib/modules/heimdalKerberos.inc:218
 #: ../lib/modules/heimdalKerberos.inc:293
-#: ../lib/modules/heimdalKerberos.inc:690 ../help/help.inc:214
+#: ../lib/modules/heimdalKerberos.inc:688 ../help/help.inc:214
 msgid "User name"
 msgstr "User name"
 
 #: ../lib/modules/windowsUser.inc:130 ../lib/modules/windowsUser.inc:645
 #: ../lib/modules/windowsUser.inc:853 ../lib/modules/windowsUser.inc:954
-#: ../lib/modules/windowsUser.inc:1083 ../lib/modules/windowsUser.inc:2427
-#: ../lib/modules/windowsUser.inc:3215
+#: ../lib/modules/windowsUser.inc:1083 ../lib/modules/windowsUser.inc:2425
+#: ../lib/modules/windowsUser.inc:3213
 msgid "User name (pre W2K)"
 msgstr "User name (pre W2K)"
 
 #: ../lib/modules/selfRegistration.inc:508 ../lib/modules/posixAccount.inc:121
-#: ../lib/modules/pykotaUser.inc:313 ../lib/modules/pykotaUser.inc:314
-#: ../lib/modules/pykotaUser.inc:317 ../lib/modules/pykotaUser.inc:318
-#: ../lib/modules/inetOrgPerson.inc:99
+#: ../lib/modules/pykotaUser.inc:316 ../lib/modules/pykotaUser.inc:317
+#: ../lib/modules/pykotaUser.inc:320 ../lib/modules/pykotaUser.inc:321
+#: ../lib/modules/inetOrgPerson.inc:97
 msgid "User name already exists!"
 msgstr "User name already exists!"
 
-#: ../lib/modules/passwordSelfReset.inc:641
+#: ../lib/modules/passwordSelfReset.inc:639
 msgid "User name and email address"
 msgstr "User name and email address"
 
@@ -16876,17 +16983,17 @@ msgstr "User name attribute"
 #: ../lib/modules/account.inc:125 ../lib/modules/account.inc:127
 #: ../lib/modules/zarafaContact.inc:207 ../lib/modules/zarafaContact.inc:208
 #: ../lib/modules/uidObject.inc:85 ../lib/modules/zarafaGroup.inc:205
-#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/nisNetGroupHost.inc:76
+#: ../lib/modules/zarafaGroup.inc:206 ../lib/modules/nisNetGroupHost.inc:79
 #: ../lib/modules/posixAccount.inc:114 ../lib/modules/posixAccount.inc:119
-#: ../lib/modules/zarafaUser.inc:441 ../lib/modules/zarafaUser.inc:442
+#: ../lib/modules/zarafaUser.inc:444 ../lib/modules/zarafaUser.inc:445
 #: ../lib/modules/windowsUser.inc:950 ../lib/modules/windowsUser.inc:951
 #: ../lib/modules/windowsUser.inc:954 ../lib/modules/windowsUser.inc:955
-#: ../lib/modules/pykotaUser.inc:311 ../lib/modules/pykotaUser.inc:312
-#: ../lib/modules/pykotaUser.inc:315 ../lib/modules/pykotaUser.inc:316
-#: ../lib/modules/nisnetgroup.inc:152 ../lib/modules/inetOrgPerson.inc:97
-#: ../lib/modules/inetOrgPerson.inc:98
-#: ../lib/modules/passwordSelfReset.inc:1097
-#: ../lib/modules/passwordSelfReset.inc:1338
+#: ../lib/modules/pykotaUser.inc:314 ../lib/modules/pykotaUser.inc:315
+#: ../lib/modules/pykotaUser.inc:318 ../lib/modules/pykotaUser.inc:319
+#: ../lib/modules/nisnetgroup.inc:155 ../lib/modules/inetOrgPerson.inc:95
+#: ../lib/modules/inetOrgPerson.inc:96
+#: ../lib/modules/passwordSelfReset.inc:1095
+#: ../lib/modules/passwordSelfReset.inc:1336
 #: ../lib/modules/heimdalKerberos.inc:253
 #: ../lib/modules/heimdalKerberos.inc:254
 msgid ""
@@ -16913,7 +17020,7 @@ msgid "User name in use. Selected next free user name."
 msgstr "User name in use. Selected next free user name."
 
 #: ../lib/modules/mitKerberos.inc:117 ../lib/modules/account.inc:102
-#: ../lib/modules/pykotaUser.inc:113 ../lib/modules/inetOrgPerson.inc:772
+#: ../lib/modules/pykotaUser.inc:116 ../lib/modules/inetOrgPerson.inc:770
 #: ../lib/modules/heimdalKerberos.inc:95
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,A-"
@@ -16932,17 +17039,17 @@ msgstr ""
 "Z,0-9, @.-_. If user name is already used user name will be expanded with a "
 "number. The next free number will be used."
 
-#: ../lib/modules/passwordSelfReset.inc:642
-#: ../lib/modules/passwordSelfReset.inc:1069
-#: ../lib/modules/passwordSelfReset.inc:1254
+#: ../lib/modules/passwordSelfReset.inc:640
+#: ../lib/modules/passwordSelfReset.inc:1067
+#: ../lib/modules/passwordSelfReset.inc:1252
 msgid "User name or email address"
 msgstr "User name or email address"
 
-#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:1994
+#: ../lib/modules/posixAccount.inc:377 ../lib/modules/posixAccount.inc:1992
 msgid "User name suggestion"
 msgstr "User name suggestion"
 
-#: ../lib/modules/pykotaUser.inc:125
+#: ../lib/modules/pykotaUser.inc:128
 msgid "User name that is used for PyKota."
 msgstr "User name that is used for PyKota."
 
@@ -16954,25 +17061,25 @@ msgstr "User profile"
 msgid "User self registration"
 msgstr "User self registration"
 
-#: ../lib/modules/zarafaUser.inc:142 ../lib/modules/zarafaUser.inc:303
-#: ../lib/modules/zarafaUser.inc:395 ../lib/modules/zarafaUser.inc:645
-#: ../lib/modules/zarafaUser.inc:1271 ../lib/modules/zarafaUser.inc:1363
-#: ../lib/modules/zarafaUser.inc:1846
+#: ../lib/modules/zarafaUser.inc:145 ../lib/modules/zarafaUser.inc:306
+#: ../lib/modules/zarafaUser.inc:398 ../lib/modules/zarafaUser.inc:648
+#: ../lib/modules/zarafaUser.inc:1272 ../lib/modules/zarafaUser.inc:1364
+#: ../lib/modules/zarafaUser.inc:1847
 msgid "User server"
 msgstr "User server"
 
 #: ../lib/types/user.inc:53 ../lib/modules/posixAccount.inc:93
 #: ../lib/modules/posixAccount.inc:94 ../lib/modules/posixAccount.inc:97
-#: ../lib/modules/posixAccount.inc:1886 ../lib/modules/zarafaUser.inc:1818
+#: ../lib/modules/posixAccount.inc:1884 ../lib/modules/zarafaUser.inc:1819
 #: ../lib/modules/sudoRole.inc:74 ../lib/modules/sudoRole.inc:98
 #: ../lib/modules/sudoRole.inc:159 ../lib/modules/sudoRole.inc:216
 #: ../lib/modules/sudoRole.inc:228 ../lib/modules/sudoRole.inc:316
-#: ../lib/modules/sudoRole.inc:755
+#: ../lib/modules/sudoRole.inc:753
 msgid "Users"
 msgstr "Users"
 
 #: ../lib/modules/zarafaContact.inc:86 ../lib/modules/zarafaGroup.inc:99
-#: ../lib/modules/zarafaUser.inc:119
+#: ../lib/modules/zarafaUser.inc:122
 msgid "Users or groups that may directly send email as this user."
 msgstr "Users or groups that may directly send email as this user."
 
@@ -16992,12 +17099,12 @@ msgstr ""
 "Users who will become member of the current group. User names are separated "
 "by semicolons."
 
-#: ../templates/tests/lamdaemonTest.php:207
+#: ../templates/tests/lamdaemonTest.php:208
 #, php-format
 msgid "Using %s as lamdaemon remote server."
 msgstr "Using %s as lamdaemon remote server."
 
-#: ../templates/tests/lamdaemonTest.php:230
+#: ../templates/tests/lamdaemonTest.php:232
 #, php-format
 msgid "Using %s to connect to remote server."
 msgstr "Using %s to connect to remote server."
@@ -17028,27 +17135,27 @@ msgstr "Valid users"
 msgid "Validate server certificate"
 msgstr "Validate server certificate"
 
-#: ../lib/modules/customFields.inc:112 ../lib/modules/customFields.inc:1935
+#: ../lib/modules/customFields.inc:112 ../lib/modules/customFields.inc:1933
 msgid "Validation expression"
 msgstr "Validation expression"
 
-#: ../lib/modules/customFields.inc:116 ../lib/modules/customFields.inc:1940
+#: ../lib/modules/customFields.inc:116 ../lib/modules/customFields.inc:1938
 msgid "Validation message"
 msgstr "Validation message"
 
-#: ../templates/multiEdit.php:124 ../lib/modules/customFields.inc:3136
+#: ../templates/multiEdit.php:147 ../lib/modules/customFields.inc:3134
 msgid "Value"
 msgstr "Value"
 
-#: ../lib/modules/customFields.inc:120 ../lib/modules/customFields.inc:2909
+#: ../lib/modules/customFields.inc:120 ../lib/modules/customFields.inc:2907
 msgid "Value for \"checked\""
 msgstr "Value for \"checked\""
 
-#: ../lib/modules/customFields.inc:124 ../lib/modules/customFields.inc:2915
+#: ../lib/modules/customFields.inc:124 ../lib/modules/customFields.inc:2913
 msgid "Value for \"unchecked\""
 msgstr "Value for \"unchecked\""
 
-#: ../lib/modules/customFields.inc:144 ../lib/modules/customFields.inc:3132
+#: ../lib/modules/customFields.inc:144 ../lib/modules/customFields.inc:3130
 msgid "Value mapping"
 msgstr "Value mapping"
 
@@ -17056,18 +17163,18 @@ msgstr "Value mapping"
 msgid "Value to delete does not exist in DN"
 msgstr "Value to delete does not exist in DN"
 
-#: ../lib/modules/puppetClient.inc:105 ../lib/modules/puppetClient.inc:109
-#: ../lib/modules/puppetClient.inc:156 ../lib/modules/puppetClient.inc:166
-#: ../lib/modules/puppetClient.inc:179 ../lib/modules/puppetClient.inc:286
-#: ../lib/modules/puppetClient.inc:420
+#: ../lib/modules/puppetClient.inc:108 ../lib/modules/puppetClient.inc:112
+#: ../lib/modules/puppetClient.inc:159 ../lib/modules/puppetClient.inc:169
+#: ../lib/modules/puppetClient.inc:182 ../lib/modules/puppetClient.inc:289
+#: ../lib/modules/puppetClient.inc:421
 msgid "Variables"
 msgstr "Variables"
 
-#: ../templates/serverInfo.php:134
+#: ../templates/serverInfo.php:135
 msgid "Vendor name"
 msgstr "Vendor name"
 
-#: ../templates/serverInfo.php:140
+#: ../templates/serverInfo.php:141
 msgid "Vendor version"
 msgstr "Vendor version"
 
@@ -17109,7 +17216,7 @@ msgstr "Views"
 #: ../lib/modules/asteriskVoicemail.inc:143
 #: ../lib/modules/asteriskVoicemail.inc:196
 #: ../lib/modules/asteriskVoicemail.inc:260
-#: ../lib/modules/asteriskVoicemail.inc:375
+#: ../lib/modules/asteriskVoicemail.inc:373
 msgid "Voicemail context"
 msgstr "Voicemail context"
 
@@ -17117,7 +17224,7 @@ msgstr "Voicemail context"
 msgid "Voicemail mailbox for this account."
 msgstr "Voicemail mailbox for this account."
 
-#: ../templates/login.php:510
+#: ../templates/login.php:519
 msgid "Want more features? Get LAM Pro!"
 msgstr "Want more features? Get LAM Pro!"
 
@@ -17126,75 +17233,75 @@ msgstr "Want more features? Get LAM Pro!"
 msgid "Warning"
 msgstr "Warning"
 
-#: ../templates/delete.php:243 ../lib/modules/nisMailAliasUser.inc:505
+#: ../templates/delete.php:251 ../lib/modules/nisMailAliasUser.inc:514
 #: ../lib/modules/posixAccount.inc:871
 #: ../lib/modules/organizationalRoleUser.inc:201
 #: ../lib/modules/organizationalRoleUser.inc:218
 #: ../lib/modules/windowsUser.inc:1912 ../lib/modules/groupOfNamesUser.inc:227
 #: ../lib/modules/groupOfNamesUser.inc:274
-#: ../lib/modules/windowsGroup.inc:1062 ../lib/modules.inc:1942
+#: ../lib/modules/windowsGroup.inc:1063 ../lib/modules.inc:1950
 #, php-format
 msgid "Was unable to add attributes to DN: %s."
 msgstr "Was unable to add attributes to DN: %s."
 
-#: ../lib/modules/nisMailAliasUser.inc:494 ../lib/modules/range.inc:665
-#: ../lib/modules/inetOrgPerson.inc:1011 ../lib/modules/inetOrgPerson.inc:2406
-#: ../lib/modules.inc:1905
+#: ../lib/modules/nisMailAliasUser.inc:503 ../lib/modules/range.inc:668
+#: ../lib/modules/inetOrgPerson.inc:1009 ../lib/modules/inetOrgPerson.inc:2402
+#: ../lib/modules.inc:1913
 #, php-format
 msgid "Was unable to create DN: %s."
 msgstr "Was unable to create DN: %s."
 
-#: ../lib/account.inc:830 ../lib/account.inc:840
-#: ../lib/modules/nisMailAliasUser.inc:471 ../lib/modules/range.inc:732
+#: ../lib/account.inc:836 ../lib/account.inc:846
+#: ../lib/modules/nisMailAliasUser.inc:480 ../lib/modules/range.inc:735
 #, php-format
 msgid "Was unable to delete DN: %s."
 msgstr "Was unable to delete DN: %s."
 
-#: ../templates/lists/changePassword.php:799
-#: ../templates/lists/changePassword.php:892
-#: ../templates/lists/changePassword.php:942 ../templates/delete.php:234
+#: ../templates/lists/changePassword.php:800
+#: ../templates/lists/changePassword.php:893
+#: ../templates/lists/changePassword.php:943 ../templates/delete.php:242
 #, php-format
 msgid "Was unable to modify attributes from DN: %s."
 msgstr "Was unable to modify attributes from DN: %s."
 
 #: ../lib/modules/posixAccount.inc:855 ../lib/modules/windowsUser.inc:1938
-#: ../lib/modules/windowsUser.inc:2395 ../lib/modules/range.inc:709
-#: ../lib/modules/nisNetGroupUser.inc:351
-#: ../lib/modules/nisNetGroupUser.inc:368
-#: ../lib/modules/nisNetGroupUser.inc:405
-#: ../lib/modules/nisNetGroupUser.inc:417
-#: ../lib/modules/nisNetGroupUser.inc:584
-#: ../lib/modules/groupOfNamesUser.inc:259 ../lib/modules.inc:1924
+#: ../lib/modules/windowsUser.inc:2395 ../lib/modules/range.inc:712
+#: ../lib/modules/nisNetGroupUser.inc:354
+#: ../lib/modules/nisNetGroupUser.inc:371
+#: ../lib/modules/nisNetGroupUser.inc:408
+#: ../lib/modules/nisNetGroupUser.inc:420
+#: ../lib/modules/nisNetGroupUser.inc:585
+#: ../lib/modules/groupOfNamesUser.inc:259 ../lib/modules.inc:1932
 #, php-format
 msgid "Was unable to modify attributes of DN: %s."
 msgstr "Was unable to modify attributes of DN: %s."
 
-#: ../templates/delete.php:252 ../lib/modules/nisMailAliasUser.inc:482
+#: ../templates/delete.php:260 ../lib/modules/nisMailAliasUser.inc:491
 #: ../lib/modules/posixAccount.inc:888
 #: ../lib/modules/organizationalRoleUser.inc:206
 #: ../lib/modules/organizationalRoleUser.inc:229
 #: ../lib/modules/windowsUser.inc:1925 ../lib/modules/groupOfNamesUser.inc:232
 #: ../lib/modules/groupOfNamesUser.inc:288
-#: ../lib/modules/windowsGroup.inc:1075 ../lib/modules.inc:1955
+#: ../lib/modules/windowsGroup.inc:1076 ../lib/modules.inc:1963
 #, php-format
 msgid "Was unable to remove attributes from DN: %s."
 msgstr "Was unable to remove attributes from DN: %s."
 
-#: ../lib/modules/asteriskExtension.inc:906 ../lib/modules.inc:1885
+#: ../lib/modules/asteriskExtension.inc:906 ../lib/modules.inc:1893
 #, php-format
 msgid "Was unable to rename DN: %s."
 msgstr "Was unable to rename DN: %s."
 
 #: ../lib/modules/windowsUser.inc:206 ../lib/modules/windowsUser.inc:508
 #: ../lib/modules/windowsUser.inc:833 ../lib/modules/windowsUser.inc:918
-#: ../lib/modules/windowsUser.inc:1123 ../lib/modules/windowsUser.inc:2451
-#: ../lib/modules/windowsUser.inc:2614 ../lib/modules/inetOrgPerson.inc:165
-#: ../lib/modules/inetOrgPerson.inc:220 ../lib/modules/inetOrgPerson.inc:484
-#: ../lib/modules/inetOrgPerson.inc:607 ../lib/modules/inetOrgPerson.inc:759
-#: ../lib/modules/inetOrgPerson.inc:763 ../lib/modules/inetOrgPerson.inc:1511
-#: ../lib/modules/inetOrgPerson.inc:1514 ../lib/modules/inetOrgPerson.inc:2011
-#: ../lib/modules/inetOrgPerson.inc:2536 ../lib/modules/inetOrgPerson.inc:3694
-#: ../lib/modules/inetOrgPerson.inc:3723
+#: ../lib/modules/windowsUser.inc:1123 ../lib/modules/windowsUser.inc:2449
+#: ../lib/modules/windowsUser.inc:2612 ../lib/modules/inetOrgPerson.inc:163
+#: ../lib/modules/inetOrgPerson.inc:218 ../lib/modules/inetOrgPerson.inc:482
+#: ../lib/modules/inetOrgPerson.inc:605 ../lib/modules/inetOrgPerson.inc:757
+#: ../lib/modules/inetOrgPerson.inc:761 ../lib/modules/inetOrgPerson.inc:1509
+#: ../lib/modules/inetOrgPerson.inc:1512 ../lib/modules/inetOrgPerson.inc:2007
+#: ../lib/modules/inetOrgPerson.inc:2532 ../lib/modules/inetOrgPerson.inc:3674
+#: ../lib/modules/inetOrgPerson.inc:3703
 msgid "Web site"
 msgstr "Web site"
 
@@ -17202,13 +17309,13 @@ msgstr "Web site"
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: ../lib/modules/bindDLZ.inc:187 ../lib/modules/bindDLZ.inc:191
-#: ../lib/modules/bindDLZ.inc:394 ../lib/modules/bindDLZ.inc:510
-#: ../lib/modules/bindDLZ.inc:1360 ../lib/modules/bindDLZ.inc:1603
+#: ../lib/modules/bindDLZ.inc:190 ../lib/modules/bindDLZ.inc:194
+#: ../lib/modules/bindDLZ.inc:397 ../lib/modules/bindDLZ.inc:513
+#: ../lib/modules/bindDLZ.inc:1363 ../lib/modules/bindDLZ.inc:1604
 msgid "Weight"
 msgstr "Weight"
 
-#: ../lib/selfService.inc:397
+#: ../lib/selfService.inc:407
 msgid "Welcome to LAM self service. Please enter your user name and password."
 msgstr "Welcome to LAM self service. Please enter your user name and password."
 
@@ -17226,7 +17333,7 @@ msgstr ""
 "When performing a recursive copy, only copy those entries which match this "
 "filter."
 
-#: ../lib/modules/zarafaUser.inc:115
+#: ../lib/modules/zarafaUser.inc:118
 msgid ""
 "When the hard quota limit is reached, email can not be delivered to that "
 "user anymore."
@@ -17242,23 +17349,23 @@ msgstr ""
 "When using ldaps:// or TLS be sure to use exactly the same IP/domain name as "
 "in your certificate!"
 
-#: ../templates/lists/changePassword.php:437
-#: ../templates/lists/changePassword.php:473 ../lib/types/user.inc:308
+#: ../templates/lists/changePassword.php:438
+#: ../templates/lists/changePassword.php:474 ../lib/types/user.inc:308
 #: ../lib/types/user.inc:414 ../lib/types/user.inc:453
 #: ../lib/types/user.inc:987 ../lib/modules/windowsHost.inc:64
-#: ../lib/modules/windowsUser.inc:101 ../lib/modules/windowsUser.inc:3401
-#: ../lib/modules/windowsUser.inc:3544 ../lib/modules/windowsGroup.inc:101
+#: ../lib/modules/windowsUser.inc:101 ../lib/modules/windowsUser.inc:3399
+#: ../lib/modules/windowsUser.inc:3542 ../lib/modules/windowsGroup.inc:104
 msgid "Windows"
 msgstr "Windows"
 
-#: ../lib/modules/posixGroup.inc:569 ../lib/modules/posixAccount.inc:1890
+#: ../lib/modules/posixGroup.inc:569 ../lib/modules/posixAccount.inc:1888
 msgid "Windows domain info"
 msgstr "Windows domain info"
 
 #: ../lib/modules/posixGroup.inc:525 ../lib/modules/posixGroup.inc:596
-#: ../lib/modules/posixGroup.inc:674 ../lib/modules/posixAccount.inc:132
-#: ../lib/modules/posixAccount.inc:448 ../lib/modules/posixAccount.inc:1911
-#: ../lib/modules/posixAccount.inc:1948
+#: ../lib/modules/posixGroup.inc:672 ../lib/modules/posixAccount.inc:132
+#: ../lib/modules/posixAccount.inc:448 ../lib/modules/posixAccount.inc:1909
+#: ../lib/modules/posixAccount.inc:1946
 msgid "Windows domain info DN"
 msgstr "Windows domain info DN"
 
@@ -17270,10 +17377,10 @@ msgstr "Windows domain name of account."
 #: ../lib/modules/sambaSamAccount.inc:477
 #: ../lib/modules/sambaSamAccount.inc:1213
 #: ../lib/modules/sambaSamAccount.inc:1729
-#: ../lib/modules/sambaSamAccount.inc:1921
+#: ../lib/modules/sambaSamAccount.inc:1919
 #: ../lib/modules/sambaGroupMapping.inc:111
 #: ../lib/modules/sambaGroupMapping.inc:374
-#: ../lib/modules/sambaGroupMapping.inc:540
+#: ../lib/modules/sambaGroupMapping.inc:538
 msgid "Windows group"
 msgstr "Windows group"
 
@@ -17307,7 +17414,7 @@ msgstr "Windows primary group SID"
 msgid "Windows-Domain name of group."
 msgstr "Windows-Domain name of group."
 
-#: ../lib/modules/windowsUser.inc:1127 ../lib/modules/inetOrgPerson.inc:1522
+#: ../lib/modules/windowsUser.inc:1127 ../lib/modules/inetOrgPerson.inc:1520
 msgid "Work details"
 msgstr "Work details"
 
@@ -17318,7 +17425,7 @@ msgstr "Workgroup"
 #: ../lib/modules/sambaSamAccount.inc:236
 #: ../lib/modules/sambaSamAccount.inc:367
 #: ../lib/modules/sambaSamAccount.inc:1463
-#: ../lib/modules/sambaSamAccount.inc:1940
+#: ../lib/modules/sambaSamAccount.inc:1938
 msgid "Working directory"
 msgstr "Working directory"
 
@@ -17326,17 +17433,17 @@ msgstr "Working directory"
 msgid "Working directory of initial program."
 msgstr "Working directory of initial program."
 
-#: ../templates/config/confmain.php:356
+#: ../templates/config/confmain.php:359
 msgid "Write"
 msgstr "Write"
 
-#: ../templates/config/confmain.php:272
+#: ../templates/config/confmain.php:275
 msgid "Write access"
 msgstr "Write access"
 
-#: ../templates/login.php:598 ../templates/login.php:657
-#: ../templates/selfService/selfServiceLogin.php:168
-#: ../templates/selfService/selfServiceLogin.php:196
+#: ../templates/login.php:607 ../templates/login.php:678
+#: ../templates/selfService/selfServiceLogin.php:177
+#: ../templates/selfService/selfServiceLogin.php:212
 msgid "Wrong password/user name combination. Please try again."
 msgstr "Wrong password/user name combination. Please try again."
 
@@ -17344,31 +17451,31 @@ msgstr "Wrong password/user name combination. Please try again."
 msgid "Wrong quota format. Quota must be numeric."
 msgstr "Wrong quota format. Quota must be numeric."
 
-#: ../templates/schema/schema.php:153 ../templates/schema/schema.php:195
-#: ../templates/schema/schema.php:200 ../templates/schema/schema.php:205
-#: ../templates/pdfedit/pdfpage.php:464 ../lib/modules/pykotaPrinter.inc:51
+#: ../templates/schema/schema.php:154 ../templates/schema/schema.php:196
+#: ../templates/schema/schema.php:201 ../templates/schema/schema.php:206
+#: ../templates/pdfedit/pdfpage.php:479 ../lib/modules/pykotaPrinter.inc:51
 #: ../lib/modules/pykotaPrinter.inc:170 ../lib/modules/freeRadius.inc:161
-#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:705
+#: ../lib/modules/freeRadius.inc:414 ../lib/modules/freeRadius.inc:703
 #: ../lib/modules/qmailGroup.inc:322 ../lib/modules/qmailGroup.inc:364
 #: ../lib/modules/qmailGroup.inc:977 ../lib/modules/qmailGroup.inc:978
-#: ../lib/modules/qmailGroup.inc:1023 ../lib/modules/qmailGroup.inc:1029
+#: ../lib/modules/qmailGroup.inc:1021 ../lib/modules/qmailGroup.inc:1027
 #: ../lib/modules/imapAccess.inc:468
 msgid "Yes"
 msgstr "Yes"
 
-#: ../lib/modules/sambaSamAccount.inc:2483
+#: ../lib/modules/sambaSamAccount.inc:2481
 msgid "You are not yet allowed to change your password."
 msgstr "You are not yet allowed to change your password."
 
-#: ../templates/lists/changePassword.php:556
-#: ../templates/lists/changePassword.php:566
-#: ../lib/modules/sambaSamAccount.inc:2446
-#: ../lib/modules/sambaSamAccount.inc:2540 ../lib/modules/ppolicyUser.inc:348
-#: ../lib/modules/ppolicyUser.inc:428
+#: ../templates/lists/changePassword.php:557
+#: ../templates/lists/changePassword.php:567
+#: ../lib/modules/sambaSamAccount.inc:2444
+#: ../lib/modules/sambaSamAccount.inc:2538 ../lib/modules/ppolicyUser.inc:346
+#: ../lib/modules/ppolicyUser.inc:426
 msgid "You are reusing an old password. Please choose a different password."
 msgstr "You are reusing an old password. Please choose a different password."
 
-#: ../lib/modules/account.inc:126 ../lib/modules/posixGroup.inc:667
+#: ../lib/modules/account.inc:126 ../lib/modules/posixGroup.inc:665
 #: ../lib/modules/posixAccount.inc:113 ../lib/modules/posixAccount.inc:115
 msgid ""
 "You are using capital letters. This can cause problems because Windows is "
@@ -17377,11 +17484,11 @@ msgstr ""
 "You are using capital letters. This can cause problems because Windows is "
 "not case-sensitive."
 
-#: ../help/help.inc:351
+#: ../help/help.inc:363
 msgid "You can delete or move expired accounts."
 msgstr "You can delete or move expired accounts."
 
-#: ../lib/lists.inc:1094
+#: ../lib/lists.inc:1080
 #, php-format
 msgid ""
 "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}"
@@ -17390,7 +17497,11 @@ msgstr ""
 "You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}"
 "{endlink}."
 
-#: ../templates/initsuff.php:185
+#: ../help/help.inc:283
+msgid "You can enable 2-factor authentication here (e.g. via mobile device)."
+msgstr "You can enable 2-factor authentication here (e.g. via mobile device)."
+
+#: ../templates/initsuff.php:186
 msgid ""
 "You can setup the LDAP suffixes for all account types in your LAM server "
 "profile on tab \"Account types\"."
@@ -17416,13 +17527,13 @@ msgstr ""
 
 #: ../lib/modules/zarafaDynamicGroup.inc:84
 #: ../lib/modules/zarafaContact.inc:82 ../lib/modules/zarafaGroup.inc:95
-#: ../lib/modules/zarafaAddressList.inc:72 ../lib/modules/zarafaUser.inc:99
+#: ../lib/modules/zarafaAddressList.inc:72 ../lib/modules/zarafaUser.inc:102
 msgid "You can use this to temporarily deactivate the Zarafa extension."
 msgstr "You can use this to temporarily deactivate the Zarafa extension."
 
 #: ../lib/modules/passwordSelfReset.inc:130
-#: ../lib/modules/passwordSelfReset.inc:140 ../help/help.inc:291
-#: ../help/help.inc:330
+#: ../lib/modules/passwordSelfReset.inc:140 ../help/help.inc:303
+#: ../help/help.inc:342
 msgid ""
 "You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. "
 "@@uid@@ for the user name)."
@@ -17454,7 +17565,7 @@ msgstr "You cannot perform updates while server is in read-only mode"
 msgid "You cannot rename an entry which has child entries."
 msgstr "You cannot rename an entry which has child entries."
 
-#: ../templates/config/confmain.php:583
+#: ../templates/config/confmain.php:620
 msgid ""
 "You cannot use SSL and TLS encryption at the same time. Please use either "
 "\"ldaps://\" or TLS."
@@ -17466,7 +17577,7 @@ msgstr ""
 msgid "You did not change the RDN"
 msgstr "You did not change the RDN"
 
-#: ../templates/tests/schemaTest.php:61
+#: ../templates/tests/schemaTest.php:62
 msgid ""
 "You do not have the required access rights or the LDAP schema is not "
 "published by your server."
@@ -17514,7 +17625,7 @@ msgstr "You might want to use %s instead of %s."
 msgid "You must either upload a file or provide an import in the text box."
 msgstr "You must either upload a file or provide an import in the text box."
 
-#: ../lib/modules/groupOfNames.inc:212 ../lib/modules/groupOfNames.inc:213
+#: ../lib/modules/groupOfNames.inc:215 ../lib/modules/groupOfNames.inc:216
 msgid "You need to add at least one member to this group."
 msgstr "You need to add at least one member to this group."
 
@@ -17531,7 +17642,7 @@ msgstr "You will be prompted to confirm this decision"
 msgid "Your IMAP domains and email address domain do not match."
 msgstr "Your IMAP domains and email address domain do not match."
 
-#: ../templates/tests/lamdaemonTest.php:235 ../lib/lamdaemon.inc:102
+#: ../templates/tests/lamdaemonTest.php:237 ../lib/lamdaemon.inc:102
 #, php-format
 msgid ""
 "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
@@ -17558,8 +17669,8 @@ msgstr ""
 "Your PHP.INI does not have file_uploads = ON. Please enable file uploads in "
 "PHP."
 
-#: ../templates/config/confmain.php:181
-#: ../templates/selfService/adminMain.php:376
+#: ../templates/config/confmain.php:184
+#: ../templates/selfService/adminMain.php:392
 msgid ""
 "Your changes cannot be saved until you make the file writable for the "
 "webserver user."
@@ -17567,7 +17678,7 @@ msgstr ""
 "Your changes cannot be saved until you make the file writable for the "
 "webserver user."
 
-#: ../templates/login.php:514
+#: ../templates/login.php:523
 #, php-format
 msgid "Your licence expires on %s."
 msgstr "Your license expires on %s."
@@ -17588,8 +17699,8 @@ msgstr ""
 "Your new account was successfully created. Please return to login to change "
 "your user data."
 
-#: ../lib/account.inc:1319 ../lib/modules/windowsUser.inc:2737
-#: ../lib/modules/windowsUser.inc:2812
+#: ../lib/account.inc:1325 ../lib/modules/windowsUser.inc:2735
+#: ../lib/modules/windowsUser.inc:2810
 msgid ""
 "Your password does not meet the password strength qualifications. Please "
 "retry with another one."
@@ -17597,7 +17708,7 @@ msgstr ""
 "Your password does not meet the password strength qualifications. Please "
 "retry with another one."
 
-#: ../lib/modules/passwordSelfReset.inc:705
+#: ../lib/modules/passwordSelfReset.inc:703
 msgid "Your password was changed to @@newPassword@@."
 msgstr "Your password was changed to @@newPassword@@."
 
@@ -17606,7 +17717,7 @@ msgid "Your session expired, click here to go back to the login page."
 msgstr "Your session expired, click here to go back to the login page."
 
 #: ../templates/login.php:307
-#: ../templates/selfService/selfServiceLogin.php:119
+#: ../templates/selfService/selfServiceLogin.php:122
 msgid "Your session expired, please log in again."
 msgstr "Your session expired, please log in again."
 
@@ -17616,11 +17727,11 @@ msgid "Your settings were successfully saved."
 msgstr "Your settings were successfully saved."
 
 #: ../lib/modules/windowsUser.inc:480 ../lib/modules/windowsUser.inc:728
-#: ../lib/modules/inetOrgPerson.inc:518 ../lib/modules/inetOrgPerson.inc:550
+#: ../lib/modules/inetOrgPerson.inc:516 ../lib/modules/inetOrgPerson.inc:548
 msgid "YourCompany"
 msgstr "YourCompany"
 
-#: ../lib/modules/zarafaGroup.inc:61 ../lib/modules/zarafaUser.inc:75
+#: ../lib/modules/zarafaGroup.inc:61 ../lib/modules/zarafaUser.inc:78
 #: ../lib/modules/zarafaServer.inc:56
 msgid "Zarafa"
 msgstr "Zarafa"
@@ -17650,21 +17761,21 @@ msgstr "Zarafa dynamic groups"
 #: ../lib/modules/zarafaDynamicGroup.inc:95
 #: ../lib/modules/zarafaDynamicGroup.inc:183
 #: ../lib/modules/zarafaContact.inc:112 ../lib/modules/zarafaContact.inc:133
-#: ../lib/modules/zarafaGroup.inc:117 ../lib/modules/zarafaGroup.inc:754
+#: ../lib/modules/zarafaGroup.inc:117 ../lib/modules/zarafaGroup.inc:752
 #: ../lib/modules/zarafaAddressList.inc:83
-#: ../lib/modules/zarafaAddressList.inc:156 ../lib/modules/zarafaUser.inc:185
-#: ../lib/modules/zarafaUser.inc:416 ../lib/modules/zarafaUser.inc:1812
+#: ../lib/modules/zarafaAddressList.inc:156 ../lib/modules/zarafaUser.inc:188
+#: ../lib/modules/zarafaUser.inc:419 ../lib/modules/zarafaUser.inc:1813
 #: ../lib/modules/zarafaServer.inc:92 ../lib/modules/zarafaServer.inc:153
 msgid "Zarafa schema"
 msgstr "Zarafa schema"
 
-#: ../lib/modules/zarafaUser.inc:174 ../lib/modules/zarafaUser.inc:178
+#: ../lib/modules/zarafaUser.inc:177 ../lib/modules/zarafaUser.inc:181
 msgid "Zarafa will store the user's archives on these servers."
 msgstr "Zarafa will store the user's archives on these servers."
 
 #: ../lib/types/bind.inc:78 ../lib/modules/ddns.inc:102
 #: ../lib/modules/ddns.inc:113 ../lib/modules/ddns.inc:128
-#: ../lib/modules/ddns.inc:394 ../lib/modules/ddns.inc:426
+#: ../lib/modules/ddns.inc:394 ../lib/modules/ddns.inc:424
 msgid "Zone name"
 msgstr "Zone name"
 
@@ -17689,9 +17800,9 @@ msgstr "add value"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:118 ../lib/modules/posixGroup.inc:457
 #: ../lib/modules/zarafaAddressList.inc:106 ../lib/modules/pykotaGroup.inc:150
-#: ../lib/modules/pykotaGroup.inc:159 ../lib/modules/nisnetgroup.inc:114
-#: ../lib/modules/organizationalRole.inc:116
-#: ../lib/modules/windowsGroup.inc:243 ../lib/modules/groupOfNames.inc:128
+#: ../lib/modules/pykotaGroup.inc:159 ../lib/modules/nisnetgroup.inc:117
+#: ../lib/modules/organizationalRole.inc:119
+#: ../lib/modules/windowsGroup.inc:246 ../lib/modules/groupOfNames.inc:131
 msgid "adminstrators"
 msgstr "adminstrators"
 
@@ -17722,11 +17833,11 @@ msgstr "browse"
 msgid "bytes"
 msgstr "bytes"
 
-#: ../templates/schema/schema.php:220
+#: ../templates/schema/schema.php:221
 msgid "character"
 msgstr "character"
 
-#: ../templates/schema/schema.php:219
+#: ../templates/schema/schema.php:220
 msgid "characters"
 msgstr "characters"
 
@@ -17756,17 +17867,17 @@ msgid "delete attribute"
 msgstr "delete attribute"
 
 #: ../lib/modules/sambaSamAccount.inc:1484
-#: ../lib/modules/sambaSamAccount.inc:1960 ../lib/modules/zarafaUser.inc:650
-#: ../lib/modules/zarafaUser.inc:1323 ../lib/modules/zarafaUser.inc:1367
+#: ../lib/modules/sambaSamAccount.inc:1958 ../lib/modules/zarafaUser.inc:653
+#: ../lib/modules/zarafaUser.inc:1324 ../lib/modules/zarafaUser.inc:1368
 msgid "disabled"
 msgstr "disabled"
 
 #: ../lib/modules/sambaSamAccount.inc:1495
-#: ../lib/modules/sambaSamAccount.inc:1971
+#: ../lib/modules/sambaSamAccount.inc:1969
 msgid "disconnect"
 msgstr "disconnect"
 
-#: ../lib/modules/windowsUser.inc:664 ../lib/modules/windowsGroup.inc:251
+#: ../lib/modules/windowsUser.inc:664 ../lib/modules/windowsGroup.inc:254
 msgid "domain"
 msgstr "domain"
 
@@ -17778,8 +17889,8 @@ msgstr "download value"
 msgid "edit"
 msgstr "edit"
 
-#: ../lib/modules/zarafaUser.inc:650 ../lib/modules/zarafaUser.inc:1318
-#: ../lib/modules/zarafaUser.inc:1367
+#: ../lib/modules/zarafaUser.inc:653 ../lib/modules/zarafaUser.inc:1319
+#: ../lib/modules/zarafaUser.inc:1368
 msgid "enabled"
 msgstr "enabled"
 
@@ -17797,17 +17908,17 @@ msgid "force"
 msgstr "force"
 
 #: ../lib/modules/sambaSamAccount.inc:1503
-#: ../lib/modules/sambaSamAccount.inc:1979
+#: ../lib/modules/sambaSamAccount.inc:1977
 msgid "from any client"
 msgstr "from any client"
 
 #: ../lib/modules/sambaSamAccount.inc:1504
-#: ../lib/modules/sambaSamAccount.inc:1980
+#: ../lib/modules/sambaSamAccount.inc:1978
 msgid "from previous client only"
 msgstr "from previous client only"
 
 #: ../lib/modules/posixAccount.inc:247 ../lib/modules/posixAccount.inc:307
-#: ../lib/modules/nisnetgroup.inc:128 ../lib/modules/groupOfNamesUser.inc:73
+#: ../lib/modules/nisnetgroup.inc:131 ../lib/modules/groupOfNamesUser.inc:73
 msgid "group01,group02"
 msgstr "group01,group02"
 
@@ -17821,7 +17932,7 @@ msgid "group1@company.com,group2@company.com"
 msgstr "group1@company.com,group2@company.com"
 
 #: ../lib/modules/zarafaDynamicGroup.inc:126
-#: ../lib/modules/zarafaGroup.inc:155 ../lib/modules/windowsGroup.inc:227
+#: ../lib/modules/zarafaGroup.inc:155 ../lib/modules/windowsGroup.inc:230
 msgid "group@company.com"
 msgstr "group@company.com"
 
@@ -17829,12 +17940,12 @@ msgstr "group@company.com"
 msgid "hint"
 msgstr "hint"
 
-#: ../lib/modules/quota.inc:198 ../lib/modules/quota.inc:200
+#: ../lib/modules/quota.inc:201 ../lib/modules/quota.inc:203
 msgid "hours"
 msgstr "hours"
 
 #: ../lib/modules/windowsUser.inc:510 ../lib/modules/windowsUser.inc:516
-#: ../lib/modules/inetOrgPerson.inc:486
+#: ../lib/modules/inetOrgPerson.inc:484
 msgid "http://www.company.com"
 msgstr "http://www.company.com"
 
@@ -17843,22 +17954,22 @@ msgid "import"
 msgstr "import"
 
 #: ../lib/modules/sambaSamAccount.inc:1488
-#: ../lib/modules/sambaSamAccount.inc:1964
+#: ../lib/modules/sambaSamAccount.inc:1962
 msgid "input off, notify off"
 msgstr "input off, notify off"
 
 #: ../lib/modules/sambaSamAccount.inc:1487
-#: ../lib/modules/sambaSamAccount.inc:1963
+#: ../lib/modules/sambaSamAccount.inc:1961
 msgid "input off, notify on"
 msgstr "input off, notify on"
 
 #: ../lib/modules/sambaSamAccount.inc:1486
-#: ../lib/modules/sambaSamAccount.inc:1962
+#: ../lib/modules/sambaSamAccount.inc:1960
 msgid "input on, notify off"
 msgstr "input on, notify off"
 
 #: ../lib/modules/sambaSamAccount.inc:1485
-#: ../lib/modules/sambaSamAccount.inc:1961
+#: ../lib/modules/sambaSamAccount.inc:1959
 msgid "input on, notify on"
 msgstr "input on, notify on"
 
@@ -17909,37 +18020,37 @@ msgstr "mygroup"
 msgid "new"
 msgstr "new"
 
-#: ../templates/config/confmain.php:254
-#: ../lib/modules/zarafaDynamicGroup.inc:440
-#: ../lib/modules/zarafaDynamicGroup.inc:443
-#: ../lib/modules/zarafaContact.inc:620 ../lib/modules/zarafaGroup.inc:630
-#: ../lib/modules/zarafaGroup.inc:637 ../lib/modules/zarafaGroup.inc:640
-#: ../lib/modules/zarafaAddressList.inc:339
-#: ../lib/modules/zarafaAddressList.inc:342
+#: ../templates/config/confmain.php:257
+#: ../lib/modules/zarafaDynamicGroup.inc:438
+#: ../lib/modules/zarafaDynamicGroup.inc:441
+#: ../lib/modules/zarafaContact.inc:618 ../lib/modules/zarafaGroup.inc:628
+#: ../lib/modules/zarafaGroup.inc:635 ../lib/modules/zarafaGroup.inc:638
+#: ../lib/modules/zarafaAddressList.inc:337
+#: ../lib/modules/zarafaAddressList.inc:340
 #: ../lib/modules/sambaSamAccount.inc:1865
 #: ../lib/modules/sambaSamAccount.inc:1873
-#: ../lib/modules/sambaSamAccount.inc:1928
-#: ../lib/modules/sambaSamAccount.inc:1936
-#: ../lib/modules/sambaSamAccount.inc:1946
-#: ../lib/modules/sambaSamAccount.inc:1951
-#: ../lib/modules/sambaSamAccount.inc:1956
-#: ../lib/modules/sambaSamAccount.inc:2283 ../lib/modules/zarafaUser.inc:632
-#: ../lib/modules/zarafaUser.inc:1276 ../lib/modules/zarafaUser.inc:1291
-#: ../lib/modules/zarafaUser.inc:1302 ../lib/modules/zarafaUser.inc:1308
+#: ../lib/modules/sambaSamAccount.inc:1926
+#: ../lib/modules/sambaSamAccount.inc:1934
+#: ../lib/modules/sambaSamAccount.inc:1944
+#: ../lib/modules/sambaSamAccount.inc:1949
+#: ../lib/modules/sambaSamAccount.inc:1954
+#: ../lib/modules/sambaSamAccount.inc:2281 ../lib/modules/zarafaUser.inc:635
+#: ../lib/modules/zarafaUser.inc:1277 ../lib/modules/zarafaUser.inc:1292
+#: ../lib/modules/zarafaUser.inc:1303 ../lib/modules/zarafaUser.inc:1309
 #: ../lib/modules/windowsUser.inc:522 ../lib/modules/windowsUser.inc:523
 #: ../lib/modules/windowsUser.inc:524 ../lib/modules/windowsUser.inc:530
 #: ../lib/modules/windowsUser.inc:531 ../lib/modules/windowsUser.inc:532
 #: ../lib/modules/windowsUser.inc:544 ../lib/modules/windowsUser.inc:545
 #: ../lib/modules/windowsUser.inc:546 ../lib/modules/windowsUser.inc:552
 #: ../lib/modules/windowsUser.inc:553 ../lib/modules/windowsUser.inc:554
-#: ../lib/modules/windowsUser.inc:1961 ../lib/modules/windowsUser.inc:2463
-#: ../lib/modules/windowsUser.inc:2468 ../lib/modules/windowsUser.inc:2474
-#: ../lib/modules/windowsUser.inc:2479 ../lib/modules/ppolicy.inc:35
-#: ../lib/modules/ppolicy.inc:482 ../lib/modules/ppolicy.inc:492
-#: ../lib/modules/ppolicy.inc:497 ../lib/modules/ppolicy.inc:504
-#: ../lib/modules/ppolicy.inc:507 ../lib/modules/generalInformation.inc:102
-#: ../lib/modules/zarafaServer.inc:361 ../lib/modules/customFields.inc:3067
-#: ../lib/modules/fixed_ip.inc:753
+#: ../lib/modules/windowsUser.inc:1961 ../lib/modules/windowsUser.inc:2461
+#: ../lib/modules/windowsUser.inc:2466 ../lib/modules/windowsUser.inc:2472
+#: ../lib/modules/windowsUser.inc:2477 ../lib/modules/ppolicy.inc:35
+#: ../lib/modules/ppolicy.inc:480 ../lib/modules/ppolicy.inc:490
+#: ../lib/modules/ppolicy.inc:495 ../lib/modules/ppolicy.inc:502
+#: ../lib/modules/ppolicy.inc:505 ../lib/modules/generalInformation.inc:102
+#: ../lib/modules/zarafaServer.inc:359 ../lib/modules/customFields.inc:3065
+#: ../lib/modules/fixed_ip.inc:754
 msgid "no"
 msgstr "no"
 
@@ -17959,10 +18070,10 @@ msgstr "no new attributes available for this entry"
 msgid "no new binary attributes available for this entry"
 msgstr "no new binary attributes available for this entry"
 
-#: ../templates/schema/schema.php:160 ../templates/schema/schema.php:229
-#: ../templates/schema/schema.php:240 ../templates/schema/schema.php:289
-#: ../templates/schema/schema.php:355 ../templates/schema/schema.php:370
-#: ../templates/schema/schema.php:404 ../templates/schema/schema.php:426
+#: ../templates/schema/schema.php:161 ../templates/schema/schema.php:230
+#: ../templates/schema/schema.php:241 ../templates/schema/schema.php:290
+#: ../templates/schema/schema.php:356 ../templates/schema/schema.php:371
+#: ../templates/schema/schema.php:405 ../templates/schema/schema.php:427
 #: ../templates/3rdParty/pla/lib/functions.php:2612
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1573
 #: ../templates/3rdParty/pla/lib/TemplateRender.php:1581
@@ -17973,12 +18084,12 @@ msgstr "none"
 msgid "none, remove value"
 msgstr "none, remove value"
 
-#: ../templates/schema/schema.php:216
+#: ../templates/schema/schema.php:217
 msgid "not applicable"
 msgstr "not applicable"
 
-#: ../templates/schema/schema.php:167 ../templates/schema/schema.php:172
-#: ../templates/schema/schema.php:177 ../templates/schema/schema.php:210
+#: ../templates/schema/schema.php:168 ../templates/schema/schema.php:173
+#: ../templates/schema/schema.php:178 ../templates/schema/schema.php:211
 msgid "not specified"
 msgstr "not specified"
 
@@ -18019,6 +18130,11 @@ msgstr "printer01"
 msgid "printergroup1"
 msgstr "printergroup1"
 
+#: ../templates/config/confmain.php:536
+#: ../templates/selfService/adminMain.php:508
+msgid "privacyIDEA"
+msgstr "privacyIDEA"
+
 #: ../lib/modules/selfRegistration.inc:252
 msgid "reCAPTCHA secret key"
 msgstr "reCAPTCHA secret key"
@@ -18045,7 +18161,7 @@ msgid "required"
 msgstr "required"
 
 #: ../lib/modules/sambaSamAccount.inc:1496
-#: ../lib/modules/sambaSamAccount.inc:1972
+#: ../lib/modules/sambaSamAccount.inc:1970
 msgid "reset"
 msgstr "reset"
 
@@ -18064,7 +18180,7 @@ msgstr "seconds"
 #: ../lib/modules/mitKerberos.inc:244 ../lib/modules/asteriskAccount.inc:327
 #: ../lib/modules/posixGroup.inc:440 ../lib/modules/sambaSamAccount.inc:434
 #: ../lib/modules/posixAccount.inc:275 ../lib/modules/windowsUser.inc:408
-#: ../lib/modules/inetOrgPerson.inc:2153
+#: ../lib/modules/inetOrgPerson.inc:2149
 #: ../lib/modules/asteriskVoicemail.inc:167
 #: ../lib/modules/heimdalKerberos.inc:213
 msgid "secret"
@@ -18077,8 +18193,8 @@ msgstr "select the rdn attribute"
 #: ../lib/modules/mitKerberos.inc:213 ../lib/modules/uidObject.inc:69
 #: ../lib/modules/posixAccount.inc:226 ../lib/modules/windowsUser.inc:400
 #: ../lib/modules/windowsUser.inc:647 ../lib/modules/windowsUser.inc:656
-#: ../lib/modules/pykotaUser.inc:192 ../lib/modules/pykotaUser.inc:210
-#: ../lib/modules/inetOrgPerson.inc:2144
+#: ../lib/modules/pykotaUser.inc:195 ../lib/modules/pykotaUser.inc:213
+#: ../lib/modules/inetOrgPerson.inc:2140
 #: ../lib/modules/heimdalKerberos.inc:182 ../lib/modules/nisMailAlias.inc:110
 msgid "smiller"
 msgstr "smiller"
@@ -18095,7 +18211,7 @@ msgstr "smiller@yourdomain.org"
 msgid "smtp:user@example.com"
 msgstr "smtp:user@example.com"
 
-#: ../lib/modules/ldapPublicKey.inc:109
+#: ../lib/modules/ldapPublicKey.inc:112
 msgid "ssh-dss 234234 user@host"
 msgstr "ssh-dss 234234 user@host"
 
@@ -18107,11 +18223,11 @@ msgstr "structural"
 msgid "table"
 msgstr "table"
 
-#: ../lib/modules/asteriskExtension.inc:154
+#: ../lib/modules/asteriskExtension.inc:156
 msgid "test"
 msgstr "test"
 
-#: ../lib/modules/asteriskExtension.inc:174
+#: ../lib/modules/asteriskExtension.inc:176
 msgid "test-start"
 msgstr "test-start"
 
@@ -18120,7 +18236,7 @@ msgid "true"
 msgstr "true"
 
 #: ../lib/modules/ipHost.inc:105 ../lib/modules/windowsUser.inc:736
-#: ../lib/modules/inetOrgPerson.inc:372 ../lib/modules/aliasEntry.inc:71
+#: ../lib/modules/inetOrgPerson.inc:370 ../lib/modules/aliasEntry.inc:71
 #: ../lib/modules/qmailGroup.inc:281 ../lib/modules/qmailGroup.inc:289
 #: ../lib/modules/qmailGroup.inc:297
 msgid "uid=smiller,ou=People,dc=company,dc=com"
@@ -18141,7 +18257,7 @@ msgstr "user01,user02,user03"
 #: ../lib/modules/qmailUser.inc:273 ../lib/modules/qmailUser.inc:279
 #: ../lib/modules/qmailUser.inc:301 ../lib/modules/eduPerson.inc:163
 #: ../lib/modules/windowsUser.inc:486 ../lib/modules/windowsUser.inc:492
-#: ../lib/modules/pykotaUser.inc:220 ../lib/modules/inetOrgPerson.inc:468
+#: ../lib/modules/pykotaUser.inc:223 ../lib/modules/inetOrgPerson.inc:466
 #: ../lib/modules/kolabSharedFolder.inc:183
 #: ../lib/modules/asteriskVoicemail.inc:180 ../lib/modules/qmailGroup.inc:339
 #: ../lib/modules/qmailGroup.inc:347 ../lib/modules/qmailGroup.inc:355
@@ -18160,46 +18276,55 @@ msgstr "view entries"
 msgid "with "
 msgstr "with "
 
-#: ../templates/config/confmain.php:254
-#: ../lib/modules/zarafaDynamicGroup.inc:438
-#: ../lib/modules/zarafaDynamicGroup.inc:445
-#: ../lib/modules/zarafaContact.inc:622 ../lib/modules/zarafaGroup.inc:632
-#: ../lib/modules/zarafaGroup.inc:635 ../lib/modules/zarafaGroup.inc:642
-#: ../lib/modules/zarafaAddressList.inc:337
-#: ../lib/modules/zarafaAddressList.inc:344
+#: ../templates/config/confmain.php:257
+#: ../lib/modules/zarafaDynamicGroup.inc:436
+#: ../lib/modules/zarafaDynamicGroup.inc:443
+#: ../lib/modules/zarafaContact.inc:620 ../lib/modules/zarafaGroup.inc:630
+#: ../lib/modules/zarafaGroup.inc:633 ../lib/modules/zarafaGroup.inc:640
+#: ../lib/modules/zarafaAddressList.inc:335
+#: ../lib/modules/zarafaAddressList.inc:342
 #: ../lib/modules/sambaSamAccount.inc:1873
-#: ../lib/modules/sambaSamAccount.inc:1926
-#: ../lib/modules/sambaSamAccount.inc:1934
-#: ../lib/modules/sambaSamAccount.inc:1944
-#: ../lib/modules/sambaSamAccount.inc:1949
-#: ../lib/modules/sambaSamAccount.inc:1954 ../lib/modules/zarafaUser.inc:632
-#: ../lib/modules/zarafaUser.inc:1278 ../lib/modules/zarafaUser.inc:1294
-#: ../lib/modules/zarafaUser.inc:1304 ../lib/modules/zarafaUser.inc:1310
+#: ../lib/modules/sambaSamAccount.inc:1924
+#: ../lib/modules/sambaSamAccount.inc:1932
+#: ../lib/modules/sambaSamAccount.inc:1942
+#: ../lib/modules/sambaSamAccount.inc:1947
+#: ../lib/modules/sambaSamAccount.inc:1952 ../lib/modules/zarafaUser.inc:635
+#: ../lib/modules/zarafaUser.inc:1279 ../lib/modules/zarafaUser.inc:1295
+#: ../lib/modules/zarafaUser.inc:1305 ../lib/modules/zarafaUser.inc:1311
 #: ../lib/modules/windowsUser.inc:524 ../lib/modules/windowsUser.inc:532
 #: ../lib/modules/windowsUser.inc:546 ../lib/modules/windowsUser.inc:554
 #: ../lib/modules/windowsUser.inc:680 ../lib/modules/windowsUser.inc:1961
-#: ../lib/modules/windowsUser.inc:2349 ../lib/modules/windowsUser.inc:2465
-#: ../lib/modules/windowsUser.inc:2470 ../lib/modules/windowsUser.inc:2476
-#: ../lib/modules/windowsUser.inc:2481 ../lib/modules/ppolicy.inc:36
-#: ../lib/modules/ppolicy.inc:494 ../lib/modules/ppolicy.inc:499
-#: ../lib/modules/ppolicy.inc:502 ../lib/modules/ppolicy.inc:509
-#: ../lib/modules/inetOrgPerson.inc:542
+#: ../lib/modules/windowsUser.inc:2349 ../lib/modules/windowsUser.inc:2463
+#: ../lib/modules/windowsUser.inc:2468 ../lib/modules/windowsUser.inc:2474
+#: ../lib/modules/windowsUser.inc:2479 ../lib/modules/ppolicy.inc:36
+#: ../lib/modules/ppolicy.inc:492 ../lib/modules/ppolicy.inc:497
+#: ../lib/modules/ppolicy.inc:500 ../lib/modules/ppolicy.inc:507
+#: ../lib/modules/inetOrgPerson.inc:540
 #: ../lib/modules/generalInformation.inc:104
-#: ../lib/modules/zarafaServer.inc:363 ../lib/modules/customFields.inc:3067
-#: ../lib/modules/fixed_ip.inc:751
+#: ../lib/modules/zarafaServer.inc:361 ../lib/modules/customFields.inc:3065
+#: ../lib/modules/fixed_ip.inc:752
 msgid "yes"
 msgstr "yes"
 
 #: ../lib/modules/sambaSamAccount.inc:1863
-#: ../lib/modules/sambaSamAccount.inc:2281
+#: ../lib/modules/sambaSamAccount.inc:2279
 msgid "yes - ordered ascending"
 msgstr "yes - ordered ascending"
 
 #: ../lib/modules/sambaSamAccount.inc:1864
-#: ../lib/modules/sambaSamAccount.inc:2282
+#: ../lib/modules/sambaSamAccount.inc:2280
 msgid "yes - ordered descending"
 msgstr "yes - ordered descending"
 
+#~ msgid "Beginning"
+#~ msgstr "Beginning"
+
+#~ msgid "Failed to export!"
+#~ msgstr "Failed to export!"
+
+#~ msgid "Failed to import!"
+#~ msgstr "Failed to import!"
+
 #, fuzzy
 #~ msgid "Your license expires on %s."
 #~ msgstr "Your license expires on %s."