From 5366f78ba8e001abd948573a085da60cc69df50b Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Mon, 29 Oct 2018 17:14:53 +0100
Subject: [PATCH] :handshake: fix(locales) merge locales for 1.4

Signed-off-by: Benoit Mortier <benoit.mortier@opensides.be>
---
 locale/af_ZA/fusiondirectory.po       | 111 +++++++++++------------
 locale/ar/fusiondirectory.po          | 111 +++++++++++------------
 locale/ca/fusiondirectory.po          | 111 +++++++++++------------
 locale/cs_CZ/fusiondirectory.po       | 111 +++++++++++------------
 locale/de/fusiondirectory.po          | 111 +++++++++++------------
 locale/el_GR/fusiondirectory.po       | 111 +++++++++++------------
 locale/es/fusiondirectory.po          | 111 +++++++++++------------
 locale/es_CO/fusiondirectory.po       | 111 +++++++++++------------
 locale/es_VE/fusiondirectory.po       | 111 +++++++++++------------
 locale/fa_IR/fusiondirectory.po       | 111 +++++++++++------------
 locale/fi_FI/fusiondirectory.po       | 111 +++++++++++------------
 locale/fr/fusiondirectory.po          | 121 +++++++++++++-------------
 locale/hu_HU/fusiondirectory.po       | 111 +++++++++++------------
 locale/id/fusiondirectory.po          | 111 +++++++++++------------
 locale/it_IT/fusiondirectory.po       | 113 ++++++++++++------------
 locale/ja/fusiondirectory.po          | 111 +++++++++++------------
 locale/ko/fusiondirectory.po          | 111 +++++++++++------------
 locale/lv/fusiondirectory.po          | 111 +++++++++++------------
 locale/nb/fusiondirectory.po          | 111 +++++++++++------------
 locale/nl/fusiondirectory.po          | 113 ++++++++++++------------
 locale/pl/fusiondirectory.po          | 111 +++++++++++------------
 locale/pt/fusiondirectory.po          | 111 +++++++++++------------
 locale/pt_BR/fusiondirectory.po       | 111 +++++++++++------------
 locale/ru/fusiondirectory.po          | 111 +++++++++++------------
 locale/ru@petr1708/fusiondirectory.po | 111 +++++++++++------------
 locale/sv/fusiondirectory.po          | 111 +++++++++++------------
 locale/tr_TR/fusiondirectory.po       | 111 +++++++++++------------
 locale/ug/fusiondirectory.po          | 111 +++++++++++------------
 locale/vi_VN/fusiondirectory.po       | 111 +++++++++++------------
 locale/zh/fusiondirectory.po          | 111 +++++++++++------------
 locale/zh_TW/fusiondirectory.po       | 111 +++++++++++------------
 31 files changed, 1774 insertions(+), 1681 deletions(-)

diff --git a/locale/af_ZA/fusiondirectory.po b/locale/af_ZA/fusiondirectory.po
index 9bdb2c5d9..5fdb789fc 100644
--- a/locale/af_ZA/fusiondirectory.po
+++ b/locale/af_ZA/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Afrikaans (South Africa) (https://www.transifex.com/fusiondirectory/teams/12202/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index d40ac1be2..1f2c456c3 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "القسم"
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 8cf57b2d9..40c97f98c 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1264,8 +1264,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1678,23 +1678,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1719,45 +1719,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1766,7 +1766,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1846,73 +1846,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grup de l'usuari"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2088,7 +2088,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departament"
 
@@ -3718,7 +3717,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 4492bd30c..0f5efab3e 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Seřadit vzestupně"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Seřadit sestupně"
@@ -1264,8 +1264,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1676,23 +1676,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Nahrát"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "stažení"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1717,45 +1717,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Hodnota pro vícehodnotovou kolonku „%s“ není pole"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "žádné"
 
@@ -1764,7 +1764,7 @@ msgstr "žádné"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1844,73 +1844,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Neznámé"
 
@@ -2086,7 +2086,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3716,7 +3715,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 030f31343..6539c651b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Liste exportieren"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Vorlage anwenden"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -451,15 +451,15 @@ msgid "Down"
 msgstr "Ab"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Aufsteigend sortieren"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Absteigend sortieren"
@@ -1291,8 +1291,8 @@ msgid "Add %s"
 msgstr "%s hinzufügen"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1716,23 +1716,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d Bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Hochladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Herunterladen"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1757,45 +1757,45 @@ msgstr "Eine Ganzzahl/Integer größer als %d "
 msgid "An integer smaller than %d"
 msgstr "Eine Ganzzahl/Integer kleiner als %d "
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Ein Float zwischen %f und %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Ein Float größer als %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Ein Float kleiner als %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (benötigt)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ungültiger Wert für %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Keine"
 
@@ -1804,7 +1804,7 @@ msgstr "Keine"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1884,73 +1884,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "Sekunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "Minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "Stunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "Tage"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX-Gruppe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Rolle %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Gruppe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2130,7 +2130,6 @@ msgstr "Liste der Abteilungen"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Abteilung"
 
@@ -3800,7 +3799,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index 136e2fbdd..8709b55d7 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -133,12 +133,12 @@ msgid "Export list"
 msgstr "Εξαγωγή λίστας"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -166,10 +166,10 @@ msgid "Apply template"
 msgstr "Εφαρμογή προτύπου"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -326,7 +326,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -448,15 +448,15 @@ msgid "Down"
 msgstr "Κάτω"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Ταξινόμηση προς τα κάτω"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Ταξινόμηση προς τα πάνω"
@@ -1273,8 +1273,8 @@ msgid "Add %s"
 msgstr "Προσθήκη του %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1685,23 +1685,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Λήψη"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1726,45 +1726,45 @@ msgstr "Ένας ακέραιος μεγαλύτερος από %d"
 msgid "An integer smaller than %d"
 msgstr "Ένας ακέραιος μικρότερος από %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Δεκαδικός μεταξύ %f και %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (απαιτείται)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Κανένα"
 
@@ -1773,7 +1773,7 @@ msgstr "Κανένα"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1853,73 +1853,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "λεπτά"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "ώρες"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "ημέρες"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Ρόλος %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Ομάδα %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Ομάδα του χρήστη"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Άγνωστο"
 
@@ -2095,7 +2095,6 @@ msgstr "Κατάλογος των τμημάτων"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Τμήμα"
 
@@ -3750,7 +3749,11 @@ msgstr ""
 "πολλές τιμές αυτού του χαρακτηριστικού"
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 49a74d92a..b419bece5 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Exportar lista"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -450,15 +450,15 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1287,8 +1287,8 @@ msgid "Add %s"
 msgstr "Añadir %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1711,23 +1711,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1752,45 +1752,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Ninguno"
 
@@ -1799,7 +1799,7 @@ msgstr "Ninguno"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1879,73 +1879,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -2122,7 +2122,6 @@ msgstr "Lista de Departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departamento"
 
@@ -3756,7 +3755,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index a0e69eda3..8e2e80c84 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Exportar lista"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -449,15 +449,15 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Ordenar"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Ordenar de modo inverso"
@@ -1292,8 +1292,8 @@ msgid "Add %s"
 msgstr "Agregar %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1714,23 +1714,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Subir"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1755,45 +1755,45 @@ msgstr "Un número entero mayor que %d"
 msgid "An integer smaller than %d"
 msgstr "Un número entero menor a %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Un número flotante entre %f y %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Un número flotante mayor que %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Un número flotante menor que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necesario)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Ninguno"
 
@@ -1802,7 +1802,7 @@ msgstr "Ninguno"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1884,73 +1884,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Rol %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Grupo %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupo del usuario"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -2128,7 +2128,6 @@ msgstr "Lista de categorías"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departamento"
 
@@ -3817,7 +3816,11 @@ msgstr ""
 "tratamiento es un valor de sus múltiples atributos."
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 873b91535..eae512f0e 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Exportar lista"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -450,15 +450,15 @@ msgid "Down"
 msgstr "Abajo"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1287,8 +1287,8 @@ msgid "Add %s"
 msgstr "Añadir %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1711,23 +1711,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1752,45 +1752,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Ninguno"
 
@@ -1799,7 +1799,7 @@ msgstr "Ninguno"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1879,73 +1879,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "días"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -2122,7 +2122,6 @@ msgstr "Lista de Departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departamento"
 
@@ -3756,7 +3755,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index c2d096ab3..683cbc487 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "دپارتمان"
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 5b841c5d8..c8bf5dde6 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Lataa"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 711091c1d..20226f082 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2018\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -134,12 +134,12 @@ msgid "Export list"
 msgstr "Exporter la liste"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -167,10 +167,10 @@ msgid "Apply template"
 msgstr "Appliquer un modèle"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -331,7 +331,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -462,15 +462,15 @@ msgid "Down"
 msgstr "Bas"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Trier vers le haut"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Trier vers le bas"
@@ -1330,8 +1330,8 @@ msgid "Add %s"
 msgstr "Ajouter %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1762,23 +1762,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d octets)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr "L'attribut %sest désactivé, sa valeur n'a pas pu être définie"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Téléverser"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Télécharger"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1805,45 +1805,45 @@ msgstr "Un nombre entier plus grand que %d"
 msgid "An integer smaller than %d"
 msgstr "Un nombre entier plus petit que %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Un nombre à virgule flottante entre %f et %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Un nombre à virgule flottante plus grand que %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Un nombre à virgule flottante plus petit que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "La valeur du champ multivalué «%s» n'est pas un tableau"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (requis)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute \"%s\" a été défini sur une valeur non compatible"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valeur invalide pour %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Aucun"
 
@@ -1854,7 +1854,7 @@ msgstr ""
 "La valeur «%s» pour le champ «%s» n’est pas dans la liste des choix "
 "possibles"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "StringAttribute \"%s\" a été défini sur une valeur non compatible"
@@ -1942,73 +1942,73 @@ msgstr "Échec de calcul du DN pour l'objet: %s"
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Passer de \"%s\" à \"%s\" a échoué: %s"
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr "Non valide : %s"
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "O"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "secondes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "heures"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "jours"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr "Ajouter (dialogue)"
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr "Groupe POSIX %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Rôle %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Groupe %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Groupe d'utilisateurs"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -2200,7 +2200,6 @@ msgstr "Liste des départements"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Département"
 
@@ -2219,11 +2218,11 @@ msgstr "domaine"
 #: plugins/admin/departments/class_organization.inc:35
 #: plugins/personal/generic/class_user.inc:209
 msgid "Organization"
-msgstr "Organisation"
+msgstr "Organisme"
 
 #: plugins/admin/departments/class_organization.inc:52
 msgid "organization"
-msgstr "organisation"
+msgstr "organisme"
 
 #: plugins/admin/departments/class_department.inc:31
 #: plugins/admin/departments/class_department.inc:35
@@ -2373,7 +2372,7 @@ msgid ""
 "organization nodes,"
 msgstr ""
 "Gérer les nœuds des départements, pays, composants de domaine, domaines, "
-"localités et organisations"
+"localités et organismes"
 
 #: plugins/admin/departments/class_departmentManagement.inc:33
 msgid "Users and groups"
@@ -3901,7 +3900,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:189
 msgid "Home address"
-msgstr "Adresse postale"
+msgstr "Adresse personnelle"
 
 #: plugins/personal/generic/class_user.inc:189
 msgid "Home postal address"
@@ -3932,8 +3931,12 @@ msgstr ""
 "une valeur de cet attribut multivalué"
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
-msgstr "Département auquel l'utilisateur appartient"
+msgid "Unit"
+msgstr "Unité"
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
+msgstr "Unité organisationnelle à laquelle cet utilisateur appartient"
 
 #: plugins/personal/generic/class_user.inc:217
 msgid "Department No."
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index e324193bb..019752e0d 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 01c21e2ef..af5fba97a 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index e27209edc..09188e926 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2018\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -134,12 +134,12 @@ msgid "Export list"
 msgstr "Lista d'esportazione"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -167,10 +167,10 @@ msgid "Apply template"
 msgstr "Applica il modello"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -329,7 +329,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -460,15 +460,15 @@ msgid "Down"
 msgstr "Sotto"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Ordina in modo crescente"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Ordina in modo decrescente"
@@ -1321,8 +1321,8 @@ msgid "Add %s"
 msgstr "Aggiungi %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1753,23 +1753,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr "L'attributo %s è disabilitato, il suo valore non può essere impostato"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Caricare"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Scarica"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1796,45 +1796,45 @@ msgstr "Un numero intero più grande di %d"
 msgid "An integer smaller than %d"
 msgstr "Un numero intero più piccolo di %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Un numero con la virgola compreso tra %f e %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Un numero con la virgola più grande di %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Un numero con la virgola più piccolo di %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "Il valore del campo \"%s\" multivalutato non é un array"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necessario)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr "SetAttribute \"%s\" è stato impostato su un valore non compatibile"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valore non valido per %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Nessuno"
 
@@ -1845,7 +1845,7 @@ msgstr ""
 "Il valore \"%s\" per il campo \"%s\" non si trova nella lista delle scelte "
 "possibili"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr "StringAttribute \"%s\" è stato impostato su un valore non compatibile"
@@ -1932,73 +1932,73 @@ msgstr "Impossibile calcolare DN per oggetto: %s"
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr "Spostamento da \"%s\" a \"%s\" non riuscito: %s"
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "secondi"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minuti"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "ore"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "giorni"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr "Aggiungi  (dialog)"
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr "Gruppo POSIX %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Ruolo %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Raggruppa %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Gruppo di utenti"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -2190,7 +2190,6 @@ msgstr "Elenco dei dipartimenti"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -3918,8 +3917,12 @@ msgstr ""
 "valore di questo attributo multivalore"
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
-msgstr "Dipartimento al quale appartiene l'utente"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
+msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
 msgid "Department No."
diff --git a/locale/ja/fusiondirectory.po b/locale/ja/fusiondirectory.po
index 6a0e56af0..4273969d4 100644
--- a/locale/ja/fusiondirectory.po
+++ b/locale/ja/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Japanese (https://www.transifex.com/fusiondirectory/teams/12202/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ko/fusiondirectory.po b/locale/ko/fusiondirectory.po
index f045235fc..d5b68ed1b 100644
--- a/locale/ko/fusiondirectory.po
+++ b/locale/ko/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Choi Chris <chulwon.choi@gmail.com>, 2018\n"
 "Language-Team: Korean (https://www.transifex.com/fusiondirectory/teams/12202/ko/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "다운로드"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "없음"
 
@@ -1761,7 +1761,7 @@ msgstr "없음"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "알 수 없음"
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index efea0ddb9..ee8595982 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Nodaļa"
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index caddc3867..4f5aab5b8 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2083,7 +2083,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 0cb2f23d6..6d1853edf 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rombout de Neef <rombout.deneef@digipolis.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Export lijst"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Sjabloon toepassen"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -327,7 +327,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -454,15 +454,15 @@ msgid "Down"
 msgstr "Omlaag"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Sorteer opwaarts"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Sorteer neerwaarts"
@@ -1312,8 +1312,8 @@ msgid "Add %s"
 msgstr "Voeg %s toe"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1743,23 +1743,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Upload"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1786,45 +1786,45 @@ msgstr "Een integer groter dan %d"
 msgid "An integer smaller than %d"
 msgstr "Een integer kleiner dan %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Een float tussen %f en %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Een float groter dan %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Een float kleiner dan %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr "De waarde voor multi-waardevelden \"%s\" is geen array"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (verplicht)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ongeldige waarde voor %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Geen"
 
@@ -1833,7 +1833,7 @@ msgstr "Geen"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr "De waarde \"%s\" voor veld \"%s\" staat niet in de lijst van mogelijke keuzes"
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1919,73 +1919,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "seconden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "uren"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dagen"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX groep %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Rol %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Groep %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Gebruikersgroep"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -2170,7 +2170,6 @@ msgstr "Lijst met afdelingen"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Afdeling"
 
@@ -3873,8 +3872,12 @@ msgstr ""
 "van dit multi-waardeattribuut."
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
-msgstr "Afdeling tot dewelke de gebruiker behoort"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
+msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
 msgid "Department No."
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 7dc030ab1..124bd3bf1 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr "W dół"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1265,8 +1265,8 @@ msgid "Add %s"
 msgstr "Dodaj %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1677,23 +1677,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Wgraj"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1718,45 +1718,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1765,7 +1765,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1845,73 +1845,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "godzin"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dni"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupa użytkownika"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -2087,7 +2087,6 @@ msgstr "Lista departamentów"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departament"
 
@@ -3717,7 +3716,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 878f0900c..f1616958b 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -449,15 +449,15 @@ msgid "Down"
 msgstr "Para baixo"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1265,8 +1265,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1677,23 +1677,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1718,45 +1718,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1765,7 +1765,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1845,73 +1845,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupo do usuário"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2088,7 +2088,6 @@ msgstr "Lista dos departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departamento"
 
@@ -3718,7 +3717,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index ce8b3fa55..c524b1a21 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Aplicar modelo"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr "Descer"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1270,8 +1270,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1682,23 +1682,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Upload"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1723,45 +1723,45 @@ msgstr "Um inteiro maior que %d"
 msgid "An integer smaller than %d"
 msgstr "Um inteiro menor que %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Um float entre %f e %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Um float maior que %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Um float menor que %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (required)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Nenhum"
 
@@ -1770,7 +1770,7 @@ msgstr "Nenhum"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1850,73 +1850,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dias"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Grupo de usuário"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2092,7 +2092,6 @@ msgstr "Lista de departamentos"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Departamento"
 
@@ -3736,7 +3735,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index 98ad18ce8..66a699991 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Экспортировать список"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Применить шаблон"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -450,15 +450,15 @@ msgid "Down"
 msgstr "Вниз"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr "Сортировать по возврастанию"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr "Сортировать по убыванию"
@@ -1285,8 +1285,8 @@ msgid "Add %s"
 msgstr "Добавить %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1709,23 +1709,23 @@ msgid "%s (%d bytes)"
 msgstr "%s (%d байт)"
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Загрузить"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Скачать"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1750,45 +1750,45 @@ msgstr "Целое число больше %d"
 msgid "An integer smaller than %d"
 msgstr "Целое число меньше %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Вещественное число от %f до %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Вещественно число больше %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Вещественное число меньше %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (обязательный)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Неверное значение для %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1797,7 +1797,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1877,73 +1877,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "секунды"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "минуты"
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "часы"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "дни"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr "POSIX группа %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr "Роль %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr "Группа %s"
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -2123,7 +2123,6 @@ msgstr "Список подразделений"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Подразделение"
 
@@ -3792,7 +3791,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index a6bf2eec7..ab99d8f85 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru%40petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 5257a18ab..74232cb41 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr "Exportera lista"
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Tillämpa mall"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -448,15 +448,15 @@ msgid "Down"
 msgstr "Ner"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1281,8 +1281,8 @@ msgid "Add %s"
 msgstr "Lägg till %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1707,23 +1707,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "Ladda ner"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1748,45 +1748,45 @@ msgstr "En siffra större än %d"
 msgid "An integer smaller than %d"
 msgstr "En siffra mindre än %d"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr "Ett flyttal mellan %f och %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr "Ett flyttal större än %f"
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr "Ett flyttal mindre än %f"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr "%s (krävs)"
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ogiltigt värde för %s"
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr "Ingen"
 
@@ -1795,7 +1795,7 @@ msgstr "Ingen"
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1875,73 +1875,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "sekunder"
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Användarens grupp"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -2117,7 +2117,6 @@ msgstr "Avdelningslista"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Avdelning"
 
@@ -3780,7 +3779,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/tr_TR/fusiondirectory.po b/locale/tr_TR/fusiondirectory.po
index 31e0c5dee..1c203ebbb 100644
--- a/locale/tr_TR/fusiondirectory.po
+++ b/locale/tr_TR/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/fusiondirectory/teams/12202/tr_TR/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index bd052e97b..fe7714109 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index b08e90334..68c39e38e 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr "Áp dụng mẫu"
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr "Xuống"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1278,8 +1278,8 @@ msgid "Add %s"
 msgstr "Thêm %s"
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1698,23 +1698,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1739,45 +1739,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1786,7 +1786,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1866,73 +1866,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "Nhóm người dùng"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -2109,7 +2109,6 @@ msgstr "Danh sách các bộ phận"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "Bộ phận"
 
@@ -3739,7 +3738,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 510c034c0..a98dd9301 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2018\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -132,12 +132,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -165,10 +165,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -325,7 +325,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -447,15 +447,15 @@ msgid "Down"
 msgstr "关闭"
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1261,8 +1261,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1673,23 +1673,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr "上传"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr "下载"
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1714,45 +1714,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1841,73 +1841,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "小时"
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "天"
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr "用户组"
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr "未知"
 
@@ -2083,7 +2083,6 @@ msgstr "部门列表"
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr "部门"
 
@@ -3713,7 +3712,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
diff --git a/locale/zh_TW/fusiondirectory.po b/locale/zh_TW/fusiondirectory.po
index de4ddee30..a01fed33b 100644
--- a/locale/zh_TW/fusiondirectory.po
+++ b/locale/zh_TW/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2018-10-16 08:21+0000\n"
+"POT-Creation-Date: 2018-10-25 10:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/fusiondirectory/teams/12202/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:33
 #: include/simpleplugin/attributes/class_FileAttribute.inc:36
 #: include/simpleplugin/attributes/class_FileAttribute.inc:39
-#: include/simpleplugin/attributes/class_FileAttribute.inc:357
+#: include/simpleplugin/attributes/class_FileAttribute.inc:368
 #: include/simpleplugin/class_simpleTabs.inc:73
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:187
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
@@ -131,12 +131,12 @@ msgid "Export list"
 msgstr ""
 
 #: include/management/class_management.inc:224
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:144
-#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:145
-#: include/simpleplugin/attributes/class_SetAttribute.inc:516
-#: include/simpleplugin/attributes/class_SetAttribute.inc:517
-#: include/simpleplugin/class_dialogAttributes.inc:778
-#: include/simpleplugin/class_dialogAttributes.inc:779
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:149
+#: include/simpleplugin/attributes/class_PhoneNumberAttribute.inc:150
+#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:786
+#: include/simpleplugin/class_dialogAttributes.inc:787
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 #: plugins/admin/departments/dep-list.xml:79
@@ -164,10 +164,10 @@ msgid "Apply template"
 msgstr ""
 
 #: include/management/class_management.inc:269
-#: include/simpleplugin/attributes/class_FileAttribute.inc:393
-#: include/simpleplugin/attributes/class_FileAttribute.inc:394
-#: include/simpleplugin/class_dialogAttributes.inc:788
-#: include/simpleplugin/class_dialogAttributes.inc:789
+#: include/simpleplugin/attributes/class_FileAttribute.inc:404
+#: include/simpleplugin/attributes/class_FileAttribute.inc:405
+#: include/simpleplugin/class_dialogAttributes.inc:796
+#: include/simpleplugin/class_dialogAttributes.inc:797
 #: include/simpleplugin/simple-list.xml:75
 #: include/simpleplugin/simple-list.xml:125
 #: plugins/admin/departments/dep-list.xml:67
@@ -324,7 +324,7 @@ msgstr ""
 #: include/password-methods/class_password-methods.inc:200
 #: include/functions.inc:413 include/functions.inc:587
 #: include/functions.inc:634 include/functions.inc:742
-#: include/simpleplugin/attributes/class_SetAttribute.inc:750
+#: include/simpleplugin/attributes/class_SetAttribute.inc:761
 #: include/class_ldap.inc:845 include/class_ldap.inc:1202
 #: plugins/config/class_recoveryConfig.inc:136
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:90
@@ -446,15 +446,15 @@ msgid "Down"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:488
-#: include/simpleplugin/attributes/class_SetAttribute.inc:489
+#: include/simpleplugin/attributes/class_SetAttribute.inc:499
+#: include/simpleplugin/attributes/class_SetAttribute.inc:500
 #: ihtml/themes/breezy/management/list.tpl.c:11
 msgid "Sort up"
 msgstr ""
 
 #: include/class_listing.inc:303
-#: include/simpleplugin/attributes/class_SetAttribute.inc:501
-#: include/simpleplugin/attributes/class_SetAttribute.inc:502
+#: include/simpleplugin/attributes/class_SetAttribute.inc:512
+#: include/simpleplugin/attributes/class_SetAttribute.inc:513
 #: ihtml/themes/breezy/management/list.tpl.c:14
 msgid "Sort down"
 msgstr ""
@@ -1260,8 +1260,8 @@ msgid "Add %s"
 msgstr ""
 
 #: include/class_msgPool.inc:523
-#: include/simpleplugin/attributes/class_SetAttribute.inc:526
-#: include/simpleplugin/attributes/class_SetAttribute.inc:527
+#: include/simpleplugin/attributes/class_SetAttribute.inc:537
+#: include/simpleplugin/attributes/class_SetAttribute.inc:538
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
 #, php-format
 msgid "Delete"
@@ -1672,23 +1672,23 @@ msgid "%s (%d bytes)"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_FileAttribute.inc:116
-#: include/simpleplugin/class_Attribute.inc:641
+#: include/simpleplugin/class_Attribute.inc:654
 #, php-format
 msgid "Attribute %s is disabled, its value could not be set"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:172
-#: include/simpleplugin/attributes/class_FileAttribute.inc:383
-#: include/simpleplugin/attributes/class_FileAttribute.inc:384
+#: include/simpleplugin/attributes/class_FileAttribute.inc:175
+#: include/simpleplugin/attributes/class_FileAttribute.inc:394
+#: include/simpleplugin/attributes/class_FileAttribute.inc:395
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:177
-#: include/simpleplugin/attributes/class_FileAttribute.inc:178
+#: include/simpleplugin/attributes/class_FileAttribute.inc:181
+#: include/simpleplugin/attributes/class_FileAttribute.inc:182
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_FileAttribute.inc:358
+#: include/simpleplugin/attributes/class_FileAttribute.inc:369
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
@@ -1713,45 +1713,45 @@ msgstr ""
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:156
+#: include/simpleplugin/attributes/class_IntAttribute.inc:162
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:158
+#: include/simpleplugin/attributes/class_IntAttribute.inc:164
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_IntAttribute.inc:160
+#: include/simpleplugin/attributes/class_IntAttribute.inc:166
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:142
+#: include/simpleplugin/attributes/class_SetAttribute.inc:149
 #, php-format
 msgid "The value for multivaluated field \"%s\" is not an array"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:236
-#: include/simpleplugin/class_Attribute.inc:594
+#: include/simpleplugin/attributes/class_SetAttribute.inc:243
+#: include/simpleplugin/class_Attribute.inc:605
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:360
+#: include/simpleplugin/attributes/class_SetAttribute.inc:371
 #, php-format
 msgid "SetAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_SetAttribute.inc:608
+#: include/simpleplugin/attributes/class_SetAttribute.inc:619
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:66
 #: include/simpleplugin/attributes/class_SelectAttribute.inc:127
-#: include/simpleplugin/class_dialogAttributes.inc:766
+#: include/simpleplugin/class_dialogAttributes.inc:774
 msgid "None"
 msgstr ""
 
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "The value \"%s\" for field \"%s\" is not in the list of possible choices"
 msgstr ""
 
-#: include/simpleplugin/attributes/class_StringAttribute.inc:114
+#: include/simpleplugin/attributes/class_StringAttribute.inc:148
 #, php-format
 msgid "StringAttribute \"%s\" was set to a non-compatible value"
 msgstr ""
@@ -1840,73 +1840,73 @@ msgstr ""
 msgid "Move from \"%s\" to \"%s\" failed: %s"
 msgstr ""
 
-#: include/simpleplugin/class_Attribute.inc:919
+#: include/simpleplugin/class_Attribute.inc:932
 #, php-format
 msgid "Invalid: %s"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:268
+#: include/simpleplugin/class_helpersAttribute.inc:261
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:269
+#: include/simpleplugin/class_helpersAttribute.inc:262
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:270
+#: include/simpleplugin/class_helpersAttribute.inc:263
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:271
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:272
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:286
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:287
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:288
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:289
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:254
+#: include/simpleplugin/class_dialogAttributes.inc:257
 msgid "Add (dialog)"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:524
+#: include/simpleplugin/class_dialogAttributes.inc:532
 #, php-format
 msgid "POSIX group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:526
+#: include/simpleplugin/class_dialogAttributes.inc:534
 #: plugins/config/class_configInLdap.inc:471
 #, php-format
 msgid "Role %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:528
+#: include/simpleplugin/class_dialogAttributes.inc:536
 #: plugins/config/class_configInLdap.inc:464
 #, php-format
 msgid "Group %s"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:566
+#: include/simpleplugin/class_dialogAttributes.inc:574
 msgid "Group of user"
 msgstr ""
 
-#: include/simpleplugin/class_dialogAttributes.inc:768
+#: include/simpleplugin/class_dialogAttributes.inc:776
 msgid "Unknown"
 msgstr ""
 
@@ -2082,7 +2082,6 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:21
 #: plugins/admin/departments/class_department.inc:30
 #: plugins/admin/departments/class_department.inc:39
-#: plugins/personal/generic/class_user.inc:213
 msgid "Department"
 msgstr ""
 
@@ -3712,7 +3711,11 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:213
-msgid "Department to which the user belongs"
+msgid "Unit"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Organizational unit this user belongs to"
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:217
-- 
GitLab