diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 3bc8bf55d4b6d894fc555a4c1b88cbe8bedd3679..a09e63a339be7ad35a47d33354a4f67f61b1d265 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 8ba20d18674f33be9cd64f1e11baafcc0b66d480..f23464d56b4f1a5baa559c8f5b6a5d4d5f74aefc 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "La contrasenya nova i l'actual són massa similars."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "La contrasenya nova és massa curta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index ffef9f1d76de2dd7de278fc0ca9cb2aa71b9eb8d..d066cc1dd61dedf4d41bcdc1819fc3bb8840a836 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Vytvořit"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "upravit ACL kategorie"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Smazat"
@@ -1126,45 +1126,45 @@ msgstr "Ppolicy %s nebyla nalezena v LDAP!"
 msgid "You are not allowed to change your own password"
 msgstr "Nejste oprávněni ke změně svého hesla"
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Je třeba, abyste počkali %d sekund než budete moci znovu měnit své heslo"
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "Toto heslo už bylo nedávno použito"
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "Bylo zadáno naprosto stejné heslo, jako je to stávající"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Pro pokračování je třeba zadat své stávající heslo."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Zadání v kolonkách Nové heslo a Zopakování nového hesla se neshodují."
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nové heslo"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Nové a staré heslo jsou si příliš podobné."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Nové heslo nelze použít – je příliš krátké (není bezpečné)."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí přímo na klávesnici)."
 
@@ -2140,13 +2140,13 @@ msgstr "Nahoru"
 msgid "Down"
 msgstr "Dolů"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Seřadit vzestupně"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Seřadit sestupně"
 
@@ -2163,14 +2163,14 @@ msgstr "Vybrat vše"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Panel %s"
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "dny"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (vyžadováno)"
@@ -3599,56 +3606,56 @@ msgstr "Desetinné číslo menší než %f"
 msgid "Error, incorrect date: "
 msgstr "Chyba, neplatný datum:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Nelze přečíst nahraný soubor: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "soubor je prázdný"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "soubor nebyl nenalezen"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "soubor není čitelný"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bajtů)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Nahrát"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "stažení"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Základ"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Základ objektu"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Neplatná hodnota pro %s"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index b51f174a930552c482e10dbd5009e68833447f18..54c9d5ae9b519d9966bd80ecc4a4df755e1b0071 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Anlegen"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "ACL Kategorie bearbeiten"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "Passwörter ist im Verlauf alter Passwörter"
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "Bestehender Wert das Passworts wurde nicht geändert"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Das Passwort beinhaltet möglicherweise problematische Unicode-Zeichen!"
 
@@ -2140,13 +2140,13 @@ msgstr "Auf"
 msgid "Down"
 msgstr "Ab"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Aufsteigend sortieren"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Absteigend sortieren"
 
@@ -2163,14 +2163,14 @@ msgstr "Alle auswählen"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "Tage"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (benötigt)"
@@ -3599,56 +3606,56 @@ msgstr "Ein Float kleiner als %f"
 msgid "Error, incorrect date: "
 msgstr "Fehler, falsches Datum:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kann hochgeladene Datei nicht lesen: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "Die Datei ist leer"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "Die Datei wurde nicht gefunden"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "Die Datei ist nicht lesbar"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d Bytes)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Hochladen"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Herunterladen"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Objektbasis"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ungültiger Wert für %s"
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index ca6cea3b8bb0dcddd25dd6501017db6b603b419f..f31b2b5890cea2ef9226b08f8906ce592e643627 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -284,8 +284,8 @@ msgstr "Δημιουργία"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -685,8 +685,8 @@ msgid "Edit category ACL"
 msgstr "Επεξεργασία κατηγορίας ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Διαγραφή"
@@ -1132,45 +1132,45 @@ msgstr "Δεν ήταν δυνατή η εύρεση του Ppolicy \"%s\" στ
 msgid "You are not allowed to change your own password"
 msgstr "Δεν έχετε δικαίωμα αλλαγής του κωδικού σας"
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Θα πρέπει να περιμένετε %d δευτερόλεπτα για να αλλάξετε το κωδικό σας"
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "Ο κωδικός είναι στο ιστορικό παλιών κωδικών πρόσβασης."
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "Ο κωδικός πρόσβασής σας δεν έχει αλλάξει από την τρέχουσα τιμή"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Θα πρέπει να εισάγετε τον κύριο κωδικό σας για να συνεχίσετε"
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Οι κωδικοί εισάγατε ως \"Νέο κωδικό\" και \"Επανάληψη νέου κωδικού\" δεν ταιριάζουν."
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Νέος κωδικός "
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Ο παλιός και ο νέος κωδικός πρόσβασης μοιάζουν πολύ"
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Ο κωδικός που εισάγατε είναι πολύ μικρός"
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Ο νέος κωδικός πρόσβασης περιέχει προβληματικούς χαρακτήρες Unicode!"
 
@@ -2146,13 +2146,13 @@ msgstr "Πάνω"
 msgid "Down"
 msgstr "Κάτω"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Ταξινόμηση πάνω"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Ταξινόμηση κάτω"
 
@@ -2169,14 +2169,14 @@ msgstr "Επιλογή όλων"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2324,7 +2324,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3414,7 +3414,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3561,7 +3568,7 @@ msgid "days"
 msgstr "ημέρες"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (απαιτείται)"
@@ -3605,56 +3612,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "Το αρχείο είναι κενό"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Λήψη"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index fece1575df64a1cd649a9fbba45040d4ad2b91bb..c1b8eec7fbd1590059586a443a3c6b08f5a1bf08 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/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: 2016-06-02 19:36+0200\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -279,8 +279,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -680,8 +680,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1127,45 +1127,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new password"
 "\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2319,7 +2319,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3405,7 +3405,14 @@ msgid ""
 "be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on \"%2$s"
+"\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3552,7 +3559,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3597,56 +3604,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module \"imagick"
 "\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index a3f66f405cc0b1efd02ebfdf8abdb264dec2371b..67773e8d552f353463aa642a379f36897d113330 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Crear"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -2140,13 +2140,13 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "días"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "el archivo está vacío"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "fichero no encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "fichero no accesible"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 28859b1b885ae3a0d1efcc122024adc8a6ffef80..c5996e7bf87fd4fa2a8cc57f9a0c342ddba9f93c 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -279,8 +279,8 @@ msgstr "Crear"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -680,8 +680,8 @@ msgid "Edit category ACL"
 msgstr "Editar categioría ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Borrar"
@@ -1127,45 +1127,45 @@ msgstr "¡No se pudo encontrar la política \"%s\" en LDAP!"
 msgid "You are not allowed to change your own password"
 msgstr "Usted no tiene permitido cambiar su propia contraseña."
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Usted debe esperar %d segundos antes de cambiar su contraseña de nuevo."
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "La contraseña está en el historial de viejas contraseñas."
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "La contraseña no será cambiada por este valor"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Usted debe especificar su contraseña actual para poder proceder."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Las contraseñas que usted ingresó como \"Nueva contraseña\" y \"Repetir nueva contraseña\" no coinciden."
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "La contraseña anterior y la nueva son muy parecidas."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "La contraseña nueva es muy corta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La contraseña posiblemente contiene caracteres 'Unicoide' que son problemáticos."
 
@@ -2141,13 +2141,13 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Ordenar "
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Ordenar de modo inverso"
 
@@ -2164,14 +2164,14 @@ msgstr "Seleccionar todo"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2319,7 +2319,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3409,7 +3409,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Pestaña \"%s\""
@@ -3556,7 +3563,7 @@ msgid "days"
 msgstr "días"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necesario)"
@@ -3600,56 +3607,56 @@ msgstr "Un número flotante menor que %f"
 msgid "Error, incorrect date: "
 msgstr "Error, fecha incorrecta:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No se puede leer el archivo subido: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "el archivo está vacio"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "archivo no encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "archivo sin privilegios de lectura"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Subir"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Objeto base"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 20fd7d2433b5bfbad8d69f4d4b8d9e0ab832314e..926ba7fd567866813a1bf5480b6e89a064e90c91 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Crear"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
@@ -2140,13 +2140,13 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "días"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "el archivo está vacío"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "archivo no encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "archivo no accesible"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Enviar"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Descargar"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 649c9d9785d484158912ffb75553e866b05f4937..ae29ed5cfba20b6474e62d7adc90f4779bc6e07e 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "کلمه عبور جدید"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 225157028ad6f032fbe583e0ecffd38ef0074206..d75da7b574250eef4313ce4c7b2dda25d93afec0 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -281,8 +281,8 @@ msgstr "Créer"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -682,8 +682,8 @@ msgid "Edit category ACL"
 msgstr "Éditer les catégories ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
@@ -1129,45 +1129,45 @@ msgstr "La ppolicy \"%s\" n’a pas été trouvée dans le LDAP !"
 msgid "You are not allowed to change your own password"
 msgstr "Vous n’êtes pas autorisé à changer votre mot de passe"
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Vous devez attendre %d secondes avant de changer votre mot de passe à nouveau"
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "Le mot de passe est dans l'historique des mots de passe récents"
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "Le nouveau mot de passe est le même que l’ancien"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Les mots de passe entrés dans les champs 'Nouveau mot de passe' et celui dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Le nouveau et l'ancien mot de passe sont trop similaires."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Le mot de passe contient probablement des caractères Unicode qui sont problématique"
 
@@ -2143,13 +2143,13 @@ msgstr "Haut"
 msgid "Down"
 msgstr "Bas"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Trier vers le haut"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Trier vers le bas"
 
@@ -2166,14 +2166,14 @@ msgstr "Sélectionner tout"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2321,7 +2321,7 @@ msgstr "Il semble que vous essayez de déchiffrer quelque chose qui n'est pas ch
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3411,7 +3411,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr "L'objet a changé depuis son ouverture dans FusionDirectory. Toutes les modifications qui peuvent être faites par d'autres seront perdus si vous enregistrez cette entrée!"
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Onglet \"%s\""
@@ -3558,7 +3565,7 @@ msgid "days"
 msgstr "jours"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (requis)"
@@ -3602,56 +3609,56 @@ msgstr "Un nombre à virgule inférieur à %f"
 msgid "Error, incorrect date: "
 msgstr "Erreur, date incorrecte :"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Impossible de lire le fichier importé : '%s'"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "Le fichier est vide"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "fichier non trouvé"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "le fichier n'est pas lisible"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d octets)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Téléverser"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Télécharger"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque php \"imagick\" soit installée pour cela."
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Base de l'objet"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valeur invalide pour %s"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 3da0463b4f5266c5e31eb622a16b122baf3878ef..fad0a810c74ce4920f60ab0d6db17b6c86733527 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -279,8 +279,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -680,8 +680,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1127,45 +1127,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2141,13 +2141,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2164,14 +2164,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2319,7 +2319,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3409,7 +3409,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3556,7 +3563,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3600,56 +3607,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 860905c75b6a1012577c4baee7a3d69f53730f66..857e318ab1eab20e16cc5f9a59539aa214f6e8fe 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 561a9cc541b311e2ad2c7248571eb50cf611b967..305875fe3325d04d4106b7407291cccff4993e79 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -281,8 +281,8 @@ msgstr "Crea"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -682,8 +682,8 @@ msgid "Edit category ACL"
 msgstr "Modifica la categoria di ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Elimina"
@@ -1129,45 +1129,45 @@ msgstr "Impossibile trovare %s nell'annuario LDAP"
 msgid "You are not allowed to change your own password"
 msgstr "Non le é permesso cambiare la propria password"
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Devi attendere %d secondi prima di cambiare di nuovo la password"
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr "La password si trova nella cronologia delle vecchie password"
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr "La password non è stata cambiata dal valore esistente"
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova password\" non corrispondono."
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Imposta la nuova password"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "La password che hai definito come 'Nuova password' è troppo simile a quella attuale."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La password contiene caratteri Unicode eventualmente problematici!"
 
@@ -2143,13 +2143,13 @@ msgstr "Sopra"
 msgid "Down"
 msgstr "Sotto"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Ordina in modo crescente"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Ordina in modo decrescente"
 
@@ -2166,14 +2166,14 @@ msgstr "Seleziona tutto"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2321,7 +2321,7 @@ msgstr "Sembra che si stia tentando di decodificare qualcosa che non è codifica
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3411,7 +3411,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr "L'oggetto é cambiato dopo l'apertura in FusionDurectory. Tutte le modifiche che possono essere state fatte da altri andranno perse se si salva questa voce !"
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3558,7 +3565,7 @@ msgid "days"
 msgstr "giorni"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (necessario)"
@@ -3602,56 +3609,56 @@ msgstr "Un numero con la virgola più piccolo di %f"
 msgid "Error, incorrect date: "
 msgstr "Errore, la dta non è corretta: "
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Impossibile leggere il file importato : %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "il file è vuoto"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "Il file non è stato trovato"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "Il file non puó essere letto"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d bytes)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Caricare"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Scarica"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr "Impossibile salvare la foto dell'utente, Fusiondirectory necessita che il modulo PHP \"imagick\" sia installato "
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Base dell'oggetto"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valore non valido per %s"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 413f337b2b2aa2906f6aefb443685d1adeead454..66970e46806b59b6e201ee5c8be009fe28683df1 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Izveidot"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 0192158b7862cd5a787c4e4e2151b895a5478f4d..36307c9d1260031adf852b39da7d95ad4e403047 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Opprett"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index d24babc240fc1e572b5078405ba1c76c581443bc..a85f7b7c8682541dfe12a76292adc208f3596c73 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Aanmaken"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "Wijzig ACL categorie"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
 
@@ -2140,13 +2140,13 @@ msgstr "Omhoog"
 msgid "Down"
 msgstr "Omlaag"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Selecteer alles"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "dagen"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kan geupload bestand niet lezen: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "bestand is leeg"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "bestand niet gevonden"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "bestand onleesbaar"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Uploaden"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Downloaden"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Basis"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index cd6696de6eda16ceaa5d2768c07f62086a84d96a..7a85a66b93b5036eade47ebad4cb296e87407d76 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Utwórz"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Proszę podać obecne hasło aby kontynuować."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Hasło podane jako nowe jest zbyt podobne do obecnego."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr "Góra"
 msgid "Down"
 msgstr "W dół"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Wybierz wszystko"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "dni"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Wgraj"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "ÅšciÄ…gnij"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Kontener"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 1351f3f630dd17165bb5fd34d685371152baf340..527699b43f73a82e3d06b86702bf53064627de73 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Criar"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Você precisa especificar sua senha atual para continuar."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "A senha utilizada como nova e atual são muito similares."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "A senha utilizada como nova é curta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr "Para cima"
 msgid "Down"
 msgstr "Para baixo"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index 060660410a74b264b7d5df7894fc5011bc4a0b57..c10e60f4398043f757965c90440c25c7feda82ca 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -279,8 +279,8 @@ msgstr "Criar"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -680,8 +680,8 @@ msgid "Edit category ACL"
 msgstr "Editar categoria de ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
@@ -1127,45 +1127,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Você precisa especificar sua atual senha para prosseguir."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nova senha"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "A nova senha é muito similar à senha atual."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "A nova senha é muito curta."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "A senha contém caracteres Unicode  problemáticos."
 
@@ -2141,13 +2141,13 @@ msgstr "Subir"
 msgid "Down"
 msgstr "Descer"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2164,14 +2164,14 @@ msgstr "Selecionar tudo"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2319,7 +2319,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3409,7 +3409,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3556,7 +3563,7 @@ msgid "days"
 msgstr "dias"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (required)"
@@ -3600,56 +3607,56 @@ msgstr "Um float menor que %f"
 msgid "Error, incorrect date: "
 msgstr "Erro, data incorreta:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Não é possível ler arquivo enviado: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "arquivo está vazio"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "arquivo não encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "arquivo não é legivel"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Upload"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Download"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Base"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Base de objeto"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Valor inválido para %s"
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index bac7ca66cf1f5adadffe4cadd8fe61a20aab6066..6e2604802a7c8690712d4d67071a75fe8b219347 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -280,8 +280,8 @@ msgstr "Создать"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -681,8 +681,8 @@ msgid "Edit category ACL"
 msgstr "Редактировать категорию ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
@@ -1128,45 +1128,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr "Вам не разрешено изменять свой пароль"
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr "Вы должны подождать %d секунд перед повторным изменением пароля"
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Новый пароль"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Новый и текущий пароли слишком похожи."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Новый пароль слишком короткий."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Пароль содержит символы Unicode, которые могут проблемы!"
 
@@ -2142,13 +2142,13 @@ msgstr "По убыванию"
 msgid "Down"
 msgstr "Вниз"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr "Сортировать по возврастанию"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr "Сортировать по убыванию"
 
@@ -2165,14 +2165,14 @@ msgstr "Выбрать все"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2320,7 +2320,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3410,7 +3410,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Вкладка \"%s\""
@@ -3557,7 +3564,7 @@ msgid "days"
 msgstr "дни"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (обязательный)"
@@ -3601,56 +3608,56 @@ msgstr "Вещественное число меньше %f"
 msgid "Error, incorrect date: "
 msgstr "Ошибка: неправильная дата:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Не могу прочесть загруженный файл: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "файл пустой"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "файл не найден"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "файл не читаем"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr "%s (%d байт)"
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Загрузить"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Скачать"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Ветка"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Неверное значение для %s"
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 581d38eab41d8d88b4eff6afc3e01701465760c1..15ef1f086d23eb8edf1ddad8ea2d9087b3fea79a 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index 1a1f7039ccc1d45f0153ed2a3678231e5568da13..2f6e43015397276b32e579ab523469cab181dfa6 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Skapa"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "Redigera kategori-ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Ta bort"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Du behöver ange ditt nuvarande lösenord för att fortsätta."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Det nya lösenordet och det nuvarande är för lika varandra."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Det nya lösenordet är för kort."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Lösenordet innehåller möjligtvis problematiska Unicode-tecken!"
 
@@ -2140,13 +2140,13 @@ msgstr "Upp"
 msgid "Down"
 msgstr "Ner"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Välj alla"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr "%s (krävs)"
@@ -3599,56 +3606,56 @@ msgstr "Ett flyttal mindre än %f"
 msgid "Error, incorrect date: "
 msgstr "Fel, inkorrekt datum:"
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kan inte läsa uppladdad fil: %s"
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr "filen är tom"
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr "filen kunde inte hittas"
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr "filen är inte läsbar"
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "Ladda ner"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Bas"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr "Objekt-bas"
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr "Ogiltigt värde för %s"
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index 71543821908478daba4951acaf6ef9a888355210..7e5f101085888b90492e137095aba47c6478c1f6 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr ""
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 3b30226257b66ff46ae4822bb26d1d4875e70682..c3bf213dc0aa68c9b348e7fe4a884fb3cefb398b 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "Tạo "
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr "Hiệu chính mục ACL"
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "Xóa"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "Bạn cần xác định mật khẩu hiện tại để có thể tiếp tục."
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "Mật khẩu mới và mật khẩu cũ quá giống nhau."
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "Mật khẩu mới cần được cắt ngắn lại."
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr "Lên"
 msgid "Down"
 msgstr "Xuống"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr "Chọn tất"
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr ""
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "Cơ sở"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index aae5a1c9bb5503ef139e2a0d103fb39695d6ce6e..31cd462c6bd21da2be9043320fa966a1523bf822 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-02 19:36+0200\n"
-"PO-Revision-Date: 2016-06-02 17:33+0000\n"
+"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"PO-Revision-Date: 2016-06-03 11:03+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -278,8 +278,8 @@ msgstr "创建"
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:192
 #: include/simpleplugin/class_dialogAttributes.inc:635
 #: include/simpleplugin/class_dialogAttributes.inc:636
-#: include/simpleplugin/class_attribute.inc:2706
-#: include/simpleplugin/class_attribute.inc:2707
+#: include/simpleplugin/class_attribute.inc:2729
+#: include/simpleplugin/class_attribute.inc:2730
 #: include/simpleplugin/simple-list.xml:67
 #: include/simpleplugin/simple-list.xml:112
 msgid "Edit"
@@ -679,8 +679,8 @@ msgid "Edit category ACL"
 msgstr ""
 
 #: plugins/admin/aclrole/class_aclEditionDialog.inc:194
-#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2716
-#: include/simpleplugin/class_attribute.inc:2717
+#: include/class_msgPool.inc:517 include/simpleplugin/class_attribute.inc:2739
+#: include/simpleplugin/class_attribute.inc:2740
 #, php-format
 msgid "Delete"
 msgstr "删除"
@@ -1126,45 +1126,45 @@ msgstr ""
 msgid "You are not allowed to change your own password"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:619
+#: plugins/personal/generic/class_user.inc:620
 #, php-format
 msgid "You must wait %d seconds before changing your password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:633
+#: plugins/personal/generic/class_user.inc:634
 msgid "Password is in history of old passwords"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:638
-#: plugins/personal/generic/class_user.inc:642
+#: plugins/personal/generic/class_user.inc:639
+#: plugins/personal/generic/class_user.inc:643
 msgid "Password is not being changed from existing value"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:649
+#: plugins/personal/generic/class_user.inc:650
 msgid "You need to specify your current password in order to proceed."
 msgstr "您需要输入当前口令才能继续。"
 
-#: plugins/personal/generic/class_user.inc:651
+#: plugins/personal/generic/class_user.inc:652
 msgid ""
 "The passwords you've entered as \"New password\" and \"Repeated new "
 "password\" do not match."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:653
+#: plugins/personal/generic/class_user.inc:654
 #: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid "New password"
 msgstr "新口令"
 
-#: plugins/personal/generic/class_user.inc:655
+#: plugins/personal/generic/class_user.inc:656
 msgid "The password used as new and current are too similar."
 msgstr "输入的新口令和当前口令非常相似。"
 
-#: plugins/personal/generic/class_user.inc:657
+#: plugins/personal/generic/class_user.inc:658
 msgid "The password used as new is to short."
 msgstr "输入的新口令太短了。"
 
-#: plugins/personal/generic/class_user.inc:659
+#: plugins/personal/generic/class_user.inc:660
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
@@ -2140,13 +2140,13 @@ msgstr "上"
 msgid "Down"
 msgstr "关闭"
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2678
-#: include/simpleplugin/class_attribute.inc:2679
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2691
-#: include/simpleplugin/class_attribute.inc:2692
+#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
@@ -2163,14 +2163,14 @@ msgstr ""
 #: include/functions.inc:3185 include/functions.inc:3189
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
-#: include/class_xml.inc:58 include/class_plugin.inc:1503
-#: include/class_CopyPasteHandler.inc:265
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
-#: include/simpleplugin/class_attribute.inc:1794
-#: include/simpleplugin/class_attribute.inc:1898
-#: include/simpleplugin/class_attribute.inc:1900
+#: include/class_xml.inc:58 include/class_plugin.inc:790
+#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
+#: include/simpleplugin/class_attribute.inc:1817
+#: include/simpleplugin/class_attribute.inc:1921
+#: include/simpleplugin/class_attribute.inc:1923
 #: include/simpleplugin/class_simpleTabs.inc:89
 #: include/simpleplugin/class_simpleTabs.inc:399
 #: include/password-methods/class_password-methods-sasl.inc:59
@@ -2318,7 +2318,7 @@ msgstr ""
 #: include/functions.inc:791 include/functions.inc:846
 #: include/functions.inc:2991 include/functions.inc:3165
 #: include/simpleplugin/class_simplePlugin.inc:558
-#: include/simpleplugin/class_attribute.inc:2941
+#: include/simpleplugin/class_attribute.inc:2964
 #: include/password-methods/class_password-methods.inc:194
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
@@ -3408,7 +3408,14 @@ msgid ""
 " be done by others will get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1306
+#: include/class_plugin.inc:792
+#, php-format
+msgid ""
+"Recursive dependency in the template fields: \"%1$s\" cannot depend on "
+"\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
+msgstr ""
+
+#: include/class_plugin.inc:1316
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3555,7 +3562,7 @@ msgid "days"
 msgstr "天"
 
 #: include/simpleplugin/class_attribute.inc:544
-#: include/simpleplugin/class_attribute.inc:2186
+#: include/simpleplugin/class_attribute.inc:2209
 #, php-format
 msgid "%s (required)"
 msgstr ""
@@ -3599,56 +3606,56 @@ msgstr ""
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
-#: include/simpleplugin/class_attribute.inc:1551
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1571
+#: include/simpleplugin/class_attribute.inc:1574
+#: include/simpleplugin/class_attribute.inc:1577
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1548
+#: include/simpleplugin/class_attribute.inc:1571
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1551
+#: include/simpleplugin/class_attribute.inc:1574
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1554
+#: include/simpleplugin/class_attribute.inc:1577
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1587
+#: include/simpleplugin/class_attribute.inc:1610
 #, php-format
 msgid "%s (%d bytes)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1634
-#: include/simpleplugin/class_attribute.inc:1814
+#: include/simpleplugin/class_attribute.inc:1657
+#: include/simpleplugin/class_attribute.inc:1837
 msgid "Upload"
 msgstr "上传"
 
-#: include/simpleplugin/class_attribute.inc:1639
-#: include/simpleplugin/class_attribute.inc:1640
+#: include/simpleplugin/class_attribute.inc:1662
+#: include/simpleplugin/class_attribute.inc:1663
 msgid "Download"
 msgstr "下载"
 
-#: include/simpleplugin/class_attribute.inc:1795
+#: include/simpleplugin/class_attribute.inc:1818
 msgid ""
 "Cannot save user picture, FusionDirectory requires the PHP module "
 "\"imagick\" to be installed!"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1847
+#: include/simpleplugin/class_attribute.inc:1870
 #: setup/class_setupStep_Ldap.inc:50 ihtml/themes/default/simple-list.tpl.c:2
 msgid "Base"
 msgstr "位置"
 
-#: include/simpleplugin/class_attribute.inc:1850
+#: include/simpleplugin/class_attribute.inc:1873
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:2800
+#: include/simpleplugin/class_attribute.inc:2823
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""